From ee9967443fdb9116c50c46d4470792fa0624523f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 1 Apr 2014 15:53:52 +0200
Subject: [PATCH] [IMP] mass_mailing: misc improvement sin mass mailing and
 campaign form / kanban views about statistics. Will be improved when
 statbutton are available.

bzr revid: tde@openerp.com-20140401135352-zqfm8tgo1jx6z5zc
---
 addons/mass_mailing/models/mass_mailing.py |  7 +++++-
 addons/mass_mailing/views/mass_mailing.xml | 26 ++++++++--------------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 88053127dd9..2604d4e04cf 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -227,6 +227,7 @@ class MassMailingCampaign(osv.Model):
         for cid in ids:
             results[cid] = {
                 'total': Statistics.search(cr, uid, [('mass_mailing_campaign_id', '=', cid)], count=True, context=context),
+                'scheduled': Statistics.search(cr, uid, [('mass_mailing_campaign_id', '=', cid), ('scheduled', '!=', False), ('sent', '=', False)], count=True, context=context),
                 'sent': Statistics.search(cr, uid, [('mass_mailing_campaign_id', '=', cid), ('sent', '!=', False)], count=True, context=context),
                 'opened': Statistics.search(cr, uid, [('mass_mailing_campaign_id', '=', cid), ('opened', '!=', False)], count=True, context=context),
                 'replied': Statistics.search(cr, uid, [('mass_mailing_campaign_id', '=', cid), ('replied', '!=', False)], count=True, context=context),
@@ -263,7 +264,11 @@ class MassMailingCampaign(osv.Model):
         'color': fields.integer('Color Index'),
         # stat fields
         'total': fields.function(
-            _get_statistics, string='Scheduled',
+            _get_statistics, string='Total',
+            type='integer', multi='_get_statistics'
+        ),
+        'scheduled': fields.function(
+            _get_statistics, string='Total',
             type='integer', multi='_get_statistics'
         ),
         'sent': fields.function(
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index aef24670b1f..4e603bb17e1 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -242,14 +242,14 @@
                                 <field name="reply_to"/>
                             </group>
                             <group>
-                                <p colspan="2">Here be some pie charts</p>
+                                <!-- <p colspan="2">Here be some pie charts</p> -->
                                 <field name="total"/>
                                 <field name="received_ratio" attrs="{'invisible': [('total', '=', 0)]}"/>
                                 <field name="opened_ratio" attrs="{'invisible': [('total', '=', 0)]}"/>
                                 <field name="replied_ratio" attrs="{'invisible': [('total', '=', 0)]}"/>
-                                <p colspan="2">Here be some bar charts</p>
-                                <field name="opened_dayly" attrs="{'invisible': [('total', '=', 0)]}"/>
-                                <field name="replied_dayly" attrs="{'invisible': [('total', '=', 0)]}"/>
+                                <!-- <p colspan="2">Here be some bar charts</p> -->
+                                <!-- <field name="opened_dayly" attrs="{'invisible': [('total', '=', 0)]}"/>
+                                <field name="replied_dayly" attrs="{'invisible': [('total', '=', 0)]}"/> -->
                             </group>
                         </group>
                         <group>
@@ -286,18 +286,6 @@
                                 </group>
                             </div>
                         </group>
-<!--                         <group string="Email Statistics">
-                            <field name="statistics_ids" nolabel="1" colspan="2"/>
-                            <group>
-                                <field name="sent"/>
-                                <field name="opened"/>
-                                <field name="bounced"/>
-                            </group>
-                            <group>
-                                <field name="delivered"/>
-                                <field name="replied"/>
-                            </group>
-                        </group> -->
                     </sheet>
                 </form>
             </field>
@@ -434,7 +422,11 @@
                                 <field name="ab_testing"/>
                             </group>
                             <group>
-                                here be some graphs
+                                <!-- <p>Here be some graphs</p> -->
+                                <field name="total"/>
+                                <field name="sent" attrs="{'invisible': [('total', '=', 0)]}"/>
+                                <field name="opened" attrs="{'invisible': [('total', '=', 0)]}"/>
+                                <field name="replied" attrs="{'invisible': [('total', '=', 0)]}"/>
                             </group>
                         </group>
                         <group>