From 426abbc65e5569c7b38147929dd8fc774f2ae663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Sep 2013 16:00:43 +0200
Subject: [PATCH] [IMP] mass_mailing: improved various views of new objects

bzr revid: tde@openerp.com-20130913140043-wfrk7yv3qx20e5on
---
 addons/mass_mailing/mass_mailing.py       |  8 ++---
 addons/mass_mailing/mass_mailing_view.xml | 42 +++++++++++++++++------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/addons/mass_mailing/mass_mailing.py b/addons/mass_mailing/mass_mailing.py
index 61fea847486..f37208e4568 100644
--- a/addons/mass_mailing/mass_mailing.py
+++ b/addons/mass_mailing/mass_mailing.py
@@ -109,9 +109,9 @@ class MassMailingCampaign(osv.Model):
         ),
     }
 
-    # _defaults = {
-        # 'user_id': lambda self, cr, uid, ctx=None: uid,
-    # },
+    _defaults = {
+        'user_id': lambda self, cr, uid, ctx=None: uid,
+    }
 
     def launch_mass_mailing_create_wizard(self, cr, uid, ids, context=None):
         ctx = dict(context)
@@ -225,7 +225,7 @@ class MassMailing(osv.Model):
         # statistics data
         'statistics_ids': fields.one2many(
             'mail.mail.statistics', 'mass_mailing_id',
-            'Send Emails',
+            'Emails Statistics',
         ),
         'sent': fields.function(
             _get_statistics,
diff --git a/addons/mass_mailing/mass_mailing_view.xml b/addons/mass_mailing/mass_mailing_view.xml
index 31ddb004c2a..bdb1c12e016 100644
--- a/addons/mass_mailing/mass_mailing_view.xml
+++ b/addons/mass_mailing/mass_mailing_view.xml
@@ -26,14 +26,22 @@
                     <sheet>
                         <group>
                             <field name="name"/>
-                            <field name="sent"/>
-                            <field name="delivered"/>
-                            <field name="opened"/>
-                            <field name="replied"/>
-                            <field name="bounced"/>
+                            <field name="user_id"/>
+                        </group>
+                        <group>
+                            <group>
+                                <field name="sent"/>
+                                <field name="opened"/>
+                                <field name="bounced"/>
+                            </group>
+                            <group>
+                                <field name="delivered"/>
+                                <field name="replied"/>
+                            </group>
+                        </group>
+                        <group>
+                            <field name="mass_mailing_ids"/>
                         </group>
-                        <label for="mass_mailing_ids"/>
-                        <field name="mass_mailing_ids"/>
                     </sheet>
                 </form>
             </field>
@@ -135,12 +143,26 @@
                         <group>
                             <group>
                                 <field name="name"/>
-                                <field name="date"/>
+                                <field name="mass_mailing_campaign_id"/>
                             </group>
                             <group>
-                                <field name="mass_mailing_campaign_id"/>
                                 <field name="template_id"/>
                                 <field name="domain"/>
+                                <field name="date"/>
+                            </group>
+                        </group>
+                        <group>
+                            <field name="statistics_ids"/>
+                        </group>
+                        <group>
+                            <group>
+                                <field name="sent"/>
+                                <field name="opened"/>
+                                <field name="bounced"/>
+                            </group>
+                            <group>
+                                <field name="delivered"/>
+                                <field name="replied"/>
                             </group>
                         </group>
                     </sheet>
@@ -252,7 +274,7 @@
         <menuitem name="Marketing" id="base.marketing_menu" sequence="85"/>
 
         <!-- Add in marketing -->
-        <menuitem name="Mass Mailing Campaign" id="mass_mailing_campaign"
+        <menuitem name="Mass Mailing" id="mass_mailing_campaign"
             parent="base.marketing_menu" sequence="1"/>
         <menuitem name="Campaigns" id="menu_email_campaigns"
             parent="mass_mailing_campaign" sequence="1"