From d538a02c0efc8550b7a75629d9ffdc6cec75e46e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 Apr 2014 12:43:28 +0200
Subject: [PATCH] [FIX] mass_mailing: fixed graph buttons in form view + fixed
 stat computation

bzr revid: tde@openerp.com-20140415104328-yll2kgxtjmg6f3hc
---
 addons/mass_mailing/models/mass_mailing.py | 12 ++++++------
 addons/mass_mailing/views/mass_mailing.xml | 16 ++++++----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 116d4683b12..7c0bc806e6a 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -124,9 +124,9 @@ class MassMailingCampaign(osv.Model):
                 'bounced': len([s for s in stats if not s.bounced is False]),
             }
             results[cid]['delivered'] = results[cid]['sent'] - results[cid]['bounced']
-            results[cid]['received_ratio'] = 100.0 * results[cid]['delivered'] / (results[cid]['sent'] or 1)
-            results[cid]['opened_ratio'] = 100.0 * results[cid]['opened'] / (results[cid]['sent'] or 1)
-            results[cid]['replied_ratio'] = 100.0 * results[cid]['replied'] / (results[cid]['sent'] or 1)
+            results[cid]['received_ratio'] = 100.0 * results[cid]['delivered'] / (results[cid]['total'] or 1)
+            results[cid]['opened_ratio'] = 100.0 * results[cid]['opened'] / (results[cid]['total'] or 1)
+            results[cid]['replied_ratio'] = 100.0 * results[cid]['replied'] / (results[cid]['total'] or 1)
         return results
 
     _columns = {
@@ -294,9 +294,9 @@ class MassMailing(osv.Model):
                 'bounced': len([s for s in stats if not s.bounced is False]),
             }
             results[mid]['delivered'] = results[mid]['sent'] - results[mid]['bounced']
-            results[mid]['received_ratio'] = 100.0 * results[mid]['delivered'] / (results[mid]['sent'] or 1)
-            results[mid]['opened_ratio'] = 100.0 * results[mid]['opened'] / (results[mid]['sent'] or 1)
-            results[mid]['replied_ratio'] = 100.0 * results[mid]['replied'] / (results[mid]['sent'] or 1)
+            results[mid]['received_ratio'] = 100.0 * results[mid]['delivered'] / (results[mid]['total'] or 1)
+            results[mid]['opened_ratio'] = 100.0 * results[mid]['opened'] / (results[mid]['total'] or 1)
+            results[mid]['replied_ratio'] = 100.0 * results[mid]['replied'] / (results[mid]['total'] or 1)
         return results
 
     def _get_mailing_model(self, cr, uid, context=None):
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 0b620da366b..f8530e20006 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -206,16 +206,6 @@
                                 type="action" class="oe_stat_button">
                                 <field name="replied_ratio" string="Replied" widget="percentpie"/>
                             </button>
-                        </div>
-                        <div class="oe_button_box" attrs="{'invisible': [('state', 'in', ('draft','test'))]}" style="margin-bottom: 32px">
-                            <button name="%(action_view_mass_mailing_contacts)d" type="action"
-                                icon="fa-envelope-o" class="oe_stat_button">
-                                <field name="total" string="Emails" widget="statinfo"/>
-                            </button>
-                        </div>
-                        <div class="oe_button_box"
-                            style="margin-top: 8px;"
-                            attrs="{'invisible': [('total', '=', 0)]}">
                             <button name="%(action_view_mass_mailing_contacts)d"
                                 type="action" class="oe_stat_button oe_inline">
                                 <field name="opened_dayly" string="Opened Daily" widget="barchart"/>
@@ -225,6 +215,12 @@
                                 <field name="replied_dayly" string="Replied Daily" widget="barchart"/>
                             </button>
                         </div>
+                        <div class="oe_button_box" attrs="{'invisible': [('total', '=', 0)]}" style="margin-bottom: 32px">
+                            <button name="%(action_view_mass_mailing_contacts)d" type="action"
+                                icon="fa-envelope-o" class="oe_stat_button">
+                                <field name="total" string="Emails" widget="statinfo"/>
+                            </button>
+                        </div>
 
                         <group>
                             <field name="email_from"/>