From 90d9b497b3a69da385fbdf25931ed66ce6609b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 Apr 2014 12:13:42 +0200
Subject: [PATCH] [FIX] mass_mailing: various fixes in campaign view and basic
 management

bzr revid: tde@openerp.com-20140415101342-7vvadykp1udz6hgs
---
 addons/mass_mailing/models/mass_mailing.py       |  2 +-
 .../mass_mailing/static/src/css/mass_mailing.css |  2 ++
 addons/mass_mailing/views/mass_mailing.xml       | 16 +++++-----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 6f86440828f..116d4683b12 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -416,7 +416,6 @@ class MassMailing(osv.Model):
 
     _defaults = {
         'state': 'draft',
-        'create_date': fields.datetime.now,
         'email_from': lambda self, cr, uid, ctx=None: self.pool['mail.message']._get_default_from(cr, uid, context=ctx),
         'reply_to': lambda self, cr, uid, ctx=None: self.pool['mail.message']._get_default_from(cr, uid, context=ctx),
         'mailing_model': 'mail.mass_mailing.contact',
@@ -435,6 +434,7 @@ class MassMailing(osv.Model):
             'state': 'draft',
             'statistics_ids': [],
             'name': _('%s (duplicate)') % mailing.name,
+            'sent_date': False,
         })
         return super(MassMailing, self).copy_data(cr, uid, id, default, context=context)
 
diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css
index ff54b8cbfac..cc91e8acf58 100644
--- a/addons/mass_mailing/static/src/css/mass_mailing.css
+++ b/addons/mass_mailing/static/src/css/mass_mailing.css
@@ -1,5 +1,6 @@
 .openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign {
     width: 280px;
+    min-height: 141px;
 }
 
 .openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign .oe_kanban_header_right {
@@ -8,4 +9,5 @@
 
 .openerp .oe_kanban_view .oe_kanban_mass_mailing {
     width: 280px;
+    min-height: 141px;
 }
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 452630b2ec9..0b620da366b 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -434,15 +434,12 @@
             </field>
         </record>
 
-
-
         <record model="ir.ui.view" id="view_mail_mass_mailing_campaign_form">
             <field name="name">mail.mass_mailing.campaign.form</field>
             <field name="model">mail.mass_mailing.campaign</field>
             <field name="arch" type="xml">
                 <form string="Mass Mailing Campaign" version="7.0">
                     <header>
-                        <button name="%(action_view_mass_mailings_from_campaign)d" type="action" class="oe_highlight" string="New Mailing"/>
                         <field name="stage_id" widget="statusbar" clickable="True"/>
                     </header>
                     <sheet>
@@ -450,7 +447,7 @@
                             <group>
                                 <field name="name"/>
                                 <field name="user_id"/>
-                                <field name="category_ids"/>
+                                <field name="category_ids" widget="many2many_tags"/>
                             </group>
                             <group>
                                 <field name="total" invisible="1"/>
@@ -458,18 +455,15 @@
                                     attrs="{'invisible': [('total', '=', 0)]}">
                                     <button name="%(action_view_mass_mailing_contacts)d"
                                         type="action" class="oe_stat_button oe_inline">
-                                        <field name="received_ratio" widget="percentpie"/>
-                                        <span>Received</span>
+                                        <field name="received_ratio" widget="percentpie" string="Received"/>
                                     </button>
                                     <button name="%(action_view_mass_mailing_contacts)d"
                                         type="action" class="oe_stat_button oe_inline">
-                                        <field name="opened_ratio" widget="percentpie"/>
-                                        <span>Opened</span>
+                                        <field name="opened_ratio" widget="percentpie" string="Opened"/>
                                     </button>
                                     <button name="%(action_view_mass_mailing_contacts)d"
                                         type="action" class="oe_stat_button oe_inline">
-                                        <field name="replied_ratio" widget="percentpie"/>
-                                        <span>Replied</span>
+                                        <field name="replied_ratio" widget="percentpie" string="Replied"/>
                                     </button>
                                 </div>
                             </group>
@@ -521,7 +515,7 @@
                                         <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)"
                                             t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar oe_kanban_header_right"/>
                                         <h3 style="margin-bottom: 8px;"><field name="name"/></h3>
-                                        <span class="oe_tag"><field name="category_ids"/></span>
+                                        <field name="category_ids"/>
                                         <a name="%(action_view_mass_mailings_from_campaign)d" type="action"
                                             class="oe_mailings">
                                             <h4 style="margin-top: 8px;"><t t-raw="record.mass_mailing_ids.raw_value.length"/> Mailings</h4>