From 3df4eb0f7271cebe95ce6904072420a6cb2d1d9d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Apr 2014 22:31:29 +0200
Subject: [PATCH 01/14] [WIP] Mailing Lists and Contacts cleaned

bzr revid: fp@tinyerp.com-20140412203129-5l7w4qr8rf2d1nqo
---
 .../mass_mailing/data/mass_mailing_demo.xml   | 13 +--
 addons/mass_mailing/models/mass_mailing.py    | 27 ++----
 addons/mass_mailing/views/mass_mailing.xml    | 92 ++++++-------------
 addons/mass_mailing/views/res_partner.xml     | 14 ---
 4 files changed, 36 insertions(+), 110 deletions(-)

diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index 4857c235a98..d6fc5167e45 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -69,29 +69,26 @@
         <!-- Create mailing lists -->
         <record id="mass_mail_list_1" model="mail.mass_mailing.list">
             <field name="name">Imported Contacts</field>
-            <field name="model">mail.mass_mailing.contact</field>
         </record>
         <record id="mass_mail_list_2" model="mail.mass_mailing.list">
             <field name="name">Customers</field>
-            <field name="model">res.partner</field>
-            <field name="domain">[('customer', '=', True)]</field>
         </record>
 
         <!-- Create Contacts -->
         <record id="mass_mail_contact_1" model="mail.mass_mailing.contact">
             <field name="name">Aristide Antario</field>
             <field name="email">aa@example.com</field>
-            <field name="list_id" eval="ref('mass_mail_list_1')"/>
+            <field name="list_id" ref="mass_mailing.mass_mail_list_1"/>
         </record>
         <record id="mass_mail_contact_2" model="mail.mass_mailing.contact">
             <field name="name">Beverly Bridge</field>
             <field name="email">bb@example.com</field>
-            <field name="list_id" eval="ref('mass_mail_list_1')"/>
+            <field name="list_id" ref="mass_mailing.mass_mail_list_1"/>
         </record>
         <record id="mass_mail_contact_3" model="mail.mass_mailing.contact">
             <field name="name">Carol Cartridge</field>
             <field name="email">cc@example.com</field>
-            <field name="list_id" eval="ref('mass_mail_list_1')"/>
+            <field name="list_id" ref="mass_mailing.mass_mail_list_1"/>
             <field name="opt_out" eval="True"/>
         </record>
 
@@ -103,13 +100,12 @@
             <field name="name">Newsletter</field>
             <field name="stage_id" ref="mass_mailing.campaign_stage_1"/>
             <field name="user_id" eval="ref('base.user_root')"/>
-            <field name="category_id" eval="ref('mass_mailing.mass_mail_category_1')"/>
+            <field name="category_ids" eval="[(6,0,[ref('mass_mailing.mass_mail_category_1')])]"/>
         </record>
 
         <record id="mass_mail_1" model="mail.mass_mailing">
             <field name="name">First Newsletter</field>
             <field name="state">done</field>
-            <field name="template_id" eval="ref('mass_mail_template_1')"/>
             <field name="date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
             <field name="contact_list_ids" eval="[(4, ref('mass_mail_list_2'))]"/>
@@ -117,7 +113,6 @@
         <record id="mass_mail_2" model="mail.mass_mailing">
             <field name="name">Second Newsletter</field>
             <field name="state">test</field>
-            <field name="template_id" eval="ref('mass_mail_template_1')"/>
             <field name="date" eval="(DateTime.today() - relativedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S')"/>
             <field name="mass_mailing_campaign_id" eval="ref('mass_mail_campaign_1')"/>
         </record>
diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 5dbbc584785..83bcf267748 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -54,9 +54,10 @@ class MassMailingContact(osv.Model):
     _columns = {
         'name': fields.char('Name'),
         'email': fields.char('Email', required=True),
+        'create_date': fields.datetime('Create Date'),
         'list_id': fields.many2one(
             'mail.mass_mailing.list', string='Mailing List',
-            ondelete='cascade',
+            ondelete='cascade', required=True,
         ),
         'opt_out': fields.boolean('Opt Out', help='The contact has chosen not to receive mails anymore from this list'),
     }
@@ -104,8 +105,8 @@ class MassMailingCampaign(osv.Model):
             'res.users', 'Responsible',
             required=True,
         ),
-        'category_ids': fields.many2many(
-            'mail.mass_mailing.category', 'Categories'),
+        'category_ids': fields.many2many('mail.mass_mailing.category', 'mail_mass_amiling_category_rel', 
+            'category_id', 'campaign_id', string='Categories'),
         'mass_mailing_ids': fields.one2many(
             'mail.mass_mailing', 'mass_mailing_campaign_id',
             'Mass Mailings',
@@ -174,8 +175,8 @@ class MassMailing(osv.Model):
         'reply_to': fields.char('Reply To'),
 
         # Target Emails
-        'mailing_model': fields.selection(_get_mailing_model, string='Model', required=True),
-        'mailing_domain': fields.char('Domain', required=True),
+        'mailing_model': fields.selection(_get_mailing_model, string='Model'),
+        'mailing_domain': fields.char('Domain'),
         'contact_list_ids': fields.many2many(
             'mail.mass_mailing.list', 'mail_mass_mailing_list_rel',
             string='Mailing Lists',
@@ -215,7 +216,6 @@ class MassMailing(osv.Model):
     def on_change_mailing_model(self, cr, uid, ids, mailing_model, context=None):
         values = {
             'contact_list_ids': [],
-            'template_id': False,
             'contact_nbr': 0,
             'auto_reply_to_available': not mailing_model in self._get_private_models(context),
             'reply_in_thread': not mailing_model in self._get_private_models(context),
@@ -247,21 +247,6 @@ class MassMailing(osv.Model):
             )
         return {'value': values}
 
-    def on_change_template_id(self, cr, uid, ids, template_id, context=None):
-        values = {}
-        if template_id:
-            template = self.pool['email.template'].browse(cr, uid, template_id, context=context)
-            if template.email_from:
-                values['email_from'] = template.email_from
-            if template.reply_to:
-                values['reply_to'] = template.reply_to
-            values['body_html'] = template.body_html
-        else:
-            values['email_from'] = self.pool['mail.message']._get_default_from(cr, uid, context=context)
-            values['reply_to'] = False
-            values['body_html'] = False
-        return {'value': values}
-
     def on_change_contact_ab_pc(self, cr, uid, ids, contact_ab_pc, contact_nbr, context=None):
         return {'value': {'contact_ab_nbr': contact_nbr * contact_ab_pc / 100.0}}
 
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 7c0280f2c1f..b7d2017666e 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -6,7 +6,7 @@
         <menuitem name="Mass Mailing" id="mass_mailing_campaign"
             parent="base.marketing_menu" sequence="1"/>
         <!-- Marketing / Mailing Lists -->
-        <menuitem name="Contact Lists" id="mass_mailing_list"
+        <menuitem name="Mailing Lists" id="mass_mailing_list"
             parent="base.marketing_menu" sequence="2"/>
         <!-- Marketing / Configuration -->
         <menuitem name="Configuration" id="marketing_configuration"
@@ -22,9 +22,10 @@
                     <field name="email"/>
                     <field name="list_id"/>
                     <separator/>
-                    <filter string="Exclude Opt Out" name="not_opt_out" domain="[('opt_out', '=', False)]"
-                        help="Contact is not opt-out"/>
+                    <filter string="Exclude Opt Out" name="not_opt_out" domain="[('opt_out', '=', False)]"/>
                     <group expand="0" string="Group By...">
+                        <filter string="Creation Date" name="group_create_date"
+                            context="{'group_by': 'create_date'}"/>
                         <filter string="Mailing Lists" name="group_list_id"
                             context="{'group_by': 'list_id'}"/>
                     </group>
@@ -38,8 +39,8 @@
             <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Mailing Lists Subscribers" editable="top">
-                    <field name="name"/>
                     <field name="email"/>
+                    <field name="name"/>
                     <field name="list_id"/>
                     <field name="opt_out"/>
                 </tree>
@@ -100,15 +101,18 @@
             <field name="arch" type="xml">
                 <form string="Contact List" version="7.0">
                     <sheet>
-                        <!-- TODO: stat_get button and relate link -->
-                        <div class="oe_button_box" nname="buttons">
-                            <button name="%(mass_mailing.mass_mailing_list_open_contacts)d" type="action"
-                                string="Recipients"/>
+                        <div class="oe_right oe_button_box" name="buttons">
+                            <button name="%(mass_mailing.mass_mailing_list_open_contacts)d"
+                                type="action" icon="fa-user" class="oe_stat_button pull-right">
+                                <field name="contact_nbr" string="Recipients" widget="statinfo"/>
+                            </button>
+                        </div>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name"/>
+                            </h1>
                         </div>
-                        <group>
-                            <field name="name"/>
-                            <field for="contact_nbr"/>
-                        </group>
                     </sheet>
                 </form>
             </field>
@@ -268,35 +272,16 @@
                                 <span style="margin-left: 8px; margin-right: 8px">or</span>
                                 <button string='Create a New List' class="oe_link" type='object' name='action_new_list'/><br />
 
-                                <div groups="mass_mailing.group_mass_mailing_campaign" style="display: inline;">
-                                    <field name="ab_testing" invisible="1"/>
-                                    <label for="contact_ab_pc" string="AB Testing" style="display: inline-block; min-width: 90px;"/>
-                                    Email <field name="contact_ab_pc" class="oe_inline"
-                                            on_change="on_change_contact_ab_pc(contact_ab_pc, contact_nbr, context)"/>
-                                    <strong>%</strong> of recipients
-                                    (<field name="contact_ab_nbr" class="oe_inline"/> recipients)
-                                    <div attrs="{'invisible': [('ab_testing', '=', False)]}" style="display: inline;">
-                                        <span>(</span>
-                                        <field name="contact_ab_done" class="oe_inline"
-                                            attrs="{'invisible': [('ab_testing', '=', False)]}"/> already mailed
-                                        <span>)</span>
-                                    </div>
-                                </div>
+                                <field name="contact_ab_pc" groups="mass_mailing.group_mass_mailing_campaign"/>
 
                             </div>
                             <field name="date" readonly="True" groups="mass_mailing.group_mass_mailing_campaign"
                                 attrs="{'invisible': [('state', '!=', 'done')]}"/>
                             <field name="mass_mailing_campaign_id" groups="mass_mailing.group_mass_mailing_campaign"/>
                             <label for="body_html" string="Email"/>
-                            <div>
-                                <label for="template_id" string="Template"/>
-                                <field name="template_id" string="Select Template"
-                                    class="oe_inline" options="{'no_create': True, 'no_open': True}"
-                                    on_change="on_change_template_id(template_id, context)"/><br />
-                                <button name="action_edit_html" type="object" string="Edit Mail Content"
-                                    class="oe_link" style="margin-left: 8px"/>
-                                <field name="body_html"/>
-                            </div>
+                            <button name="action_edit_html" type="object" string="Edit Mail Content"
+                                class="oe_link" style="margin-left: 8px"/>
+                            <field name="body_html"/>
                         </group>
                     </sheet>
                 </form>
@@ -397,28 +382,12 @@
             <field name="model">mail.mass_mailing.stage</field>
             <field name="priority">10</field>
             <field name="arch" type="xml">
-                <tree string="Mass Mailings">
+                <tree string="Mass Mailings" editable="top">
+                    <field name="sequence" widget="handle"/>
                     <field name="name"/>
-                    <field name="sequence"/>
                 </tree>
             </field>
         </record>
-
-        <record model="ir.ui.view" id="view_mail_mass_mailing_stage_form">
-            <field name="name">mail.mass_mailing.stage.form</field>
-            <field name="model">mail.mass_mailing.stage</field>
-            <field name="arch" type="xml">
-                <form string="Mass Mailing" version="7.0">
-                    <sheet>
-                        <group>
-                            <field name="name"/>
-                            <field name="sequence"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
         <record id="action_view_mass_mailing_stages" model="ir.actions.act_window">
             <field name="name">Mass Mailing Stages</field>
             <field name="res_model">mail.mass_mailing.stage</field>
@@ -437,15 +406,13 @@
             <field name="arch" type="xml">
                <search string="Mass Mailing Campaigns">
                     <field name="name" string="Campaigns"/>
-                    <field name="category_id"/>
+                    <field name="category_ids"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Stage" name="group_stage_id"
                             context="{'group_by': 'stage_id'}"/>
                         <filter string="Responsible" name="group_user_id"
                             context="{'group_by': 'user_id'}"/>
-                        <filter string="Category" name="group_category_id"
-                            context="{'group_by': 'category_id'}"/>
                     </group>
                 </search>
             </field>
@@ -460,7 +427,7 @@
                     <field name="name"/>
                     <field name="user_id"/>
                     <field name="stage_id"/>
-                    <field name="category_id"/>
+                    <field name="category_ids"/>
                 </tree>
             </field>
         </record>
@@ -479,7 +446,7 @@
                             <group>
                                 <field name="name"/>
                                 <field name="user_id"/>
-                                <field name="category_id"/>
+                                <field name="category_ids"/>
                             </group>
                             <group>
                                 <field name="total" invisible="1"/>
@@ -550,7 +517,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_id"/></span>
+                                        <span class="oe_tag"><field name="category_ids"/></span>
                                         <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>
@@ -640,7 +607,6 @@
                         <group>
                             <field name="mass_mailing_id"/>
                             <field name="mass_mailing_campaign_id"/>
-                            <field name="template_id"/>
                             <field name="model"/>
                             <field name="res_id"/>
                         </group>
@@ -661,11 +627,5 @@
             parent="base.menu_email" sequence="50"
             action="action_view_mail_mail_statistics"/>
 
-        <!-- MISC -->
-        <!-- Mailing List Create Wizard -->
-        <menuitem name="Create a new List" id="menu_mail_mass_mailing_create"
-            parent="mass_mailing_list" sequence="10"
-            action="action_mail_mass_mailing_create"/>
-
     </data>
 </openerp>
diff --git a/addons/mass_mailing/views/res_partner.xml b/addons/mass_mailing/views/res_partner.xml
index dcb0b50d148..14710cf8f37 100644
--- a/addons/mass_mailing/views/res_partner.xml
+++ b/addons/mass_mailing/views/res_partner.xml
@@ -2,19 +2,5 @@
 <openerp>
     <data>
 
-        <!-- Create a Mailing List from Partners -->
-        <act_window name="Create Mailing List"
-            res_model="mail.mass_mailing.list.confirm"
-            src_model="res.partner"
-            view_mode="form"
-            multi="True"
-            target="new"
-            key2="client_action_multi"
-            id="action_partner_to_mailing_list"
-            context="{
-'default_mass_mailing_id': context.get('default_mass_mailing_id'),
-'default_model': context.get('default_model', 'res.partner'),
-'default_name': context.get('default_name', False)}"/>
-
     </data>
 </openerp>

From e9cf53934bb2ffa52e5cd2e69e796774e169ca74 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Apr 2014 01:21:59 +0200
Subject: [PATCH 02/14] [iMP] small improvements

bzr revid: fp@tinyerp.com-20140412232159-1y35hdpaahy633tb
---
 addons/mass_mailing/models/mass_mailing.py |  49 +++---
 addons/mass_mailing/views/mass_mailing.xml | 176 +++++++++++----------
 2 files changed, 117 insertions(+), 108 deletions(-)

diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 83bcf267748..83ceefeaa48 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -142,13 +142,13 @@ class MassMailing(osv.Model):
 
     def _get_mailing_model(self, cr, uid, context=None):
         return [
-            ('res.partner', 'Customers'),
-            ('mail.mass_mailing.contact', 'Contacts')
+            ('res.partner', _('Customers')),
+            ('mail.mass_mailing.contact', _('Mailing List'))
         ]
 
     _columns = {
         'name': fields.char('Subject', required=True),
-        'email_from': fields.char('From'),
+        'email_from': fields.char('From', required=True),
         'date': fields.datetime('Date'),
         'body_html': fields.html('Body'),
 
@@ -157,7 +157,7 @@ class MassMailing(osv.Model):
             ondelete='set null',
         ),
         'state': fields.selection(
-            [('draft', 'Schedule'), ('test', 'Tested'), ('done', 'Sent')], string='Status', required=True,
+            [('draft', 'Draft'), ('test', 'Tested'), ('done', 'Sent')], string='Status', required=True,
         ),
         'color': fields.related(
             'mass_mailing_campaign_id', 'color',
@@ -175,7 +175,7 @@ class MassMailing(osv.Model):
         'reply_to': fields.char('Reply To'),
 
         # Target Emails
-        'mailing_model': fields.selection(_get_mailing_model, string='Model'),
+        'mailing_model': fields.selection(_get_mailing_model, string='Recipients Model'),
         'mailing_domain': fields.char('Domain'),
         'contact_list_ids': fields.many2many(
             'mail.mass_mailing.list', 'mail_mass_mailing_list_rel',
@@ -212,16 +212,19 @@ class MassMailing(osv.Model):
     #------------------------------------------------------
     # Views & Actions
     #------------------------------------------------------
-
-    def on_change_mailing_model(self, cr, uid, ids, mailing_model, context=None):
-        values = {
-            'contact_list_ids': [],
-            'contact_nbr': 0,
-            'auto_reply_to_available': not mailing_model in self._get_private_models(context),
-            'reply_in_thread': not mailing_model in self._get_private_models(context),
-            'reply_specified': mailing_model in self._get_private_models(context)
-        }
-        return {'value': values}
+    def on_change_model(self, cr, uid, ids, mailing_model, list_ids, context=None):
+        value = {}
+        if mailing_model=='mail.mass_mailing.contact':
+            if list_ids and list_ids[0][0]==6 and list_ids[0][2]:
+                value['mailing_domain'] = "[('list_id', 'in', ["+','.join(map(str, list_ids[0][2]))+"])]"
+                value['contact_nbr'] = 5
+            else:
+                value['mailing_domain'] = "[('list_id', '=', False)]"
+                value['contact_nbr'] = 0
+        else:
+            value['mailing_domain'] = False
+            value['contact_nbr'] = 0
+        return {'value': value}
 
     def on_change_reply_specified(self, cr, uid, ids, reply_specified, reply_in_thread, context=None):
         if reply_specified == reply_in_thread:
@@ -271,15 +274,15 @@ class MassMailing(osv.Model):
         else:
             return self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, 'mass_mailing.action_contact_to_mailing_list')
 
-    def action_new_list(self, cr, uid, ids, context=None):
+    def action_domain_select(self, cr, uid, ids, context=None):
         mailing = self.browse(cr, uid, ids[0], context=context)
-        action_id = self._get_model_to_list_action_id(cr, uid, mailing.mailing_model, context=context)
-        ctx = dict(context,
-                   search_default_not_opt_out=True,
-                   view_manager_highlight=[action_id],
-                   default_name=mailing.name,
-                   default_mass_mailing_id=ids[0],
-                   default_model=mailing.mailing_model)
+        ctx = dict(
+            context,
+            search_default_not_opt_out=True,
+            view_manager_highlight=[action_id],         # To Change
+            default_mass_mailing_id=ids[0],
+            default_model=mailing.mailing_model
+        )
         return {
             'name': _('Choose Recipients'),
             'type': 'ir.actions.act_window',
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index b7d2017666e..52f55eaed35 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -179,110 +179,116 @@
             <field name="arch" type="xml">
                 <form string="Mass Mailing" version="7.0">
                     <header>
-                        <field name="state" widget="statusbar" clickable="True"/>
                         <button name="action_test_mailing" type="object"
                             class="oe_highlight" string="Test Mailing"/>
                         <button name="send_mail" type="object"
                             class="oe_highlight" string="Send to All"/>
+                        <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>
-                        <div class="oe_form_box_info oe_text_center"
-                                attrs="{'invisible': [('scheduled', '=', 0)]}">
+                        <div class="oe_form_box_info oe_text_center" attrs="{'invisible': [('scheduled', '=', 0)]}">
                             <p>
                                 <strong><field name="scheduled" class="oe_inline"/>emails are in queue
                                 and will be sent soon.</strong>
                             </p>
                         </div>
 
+                        <div class="oe_button_box pull-right" attrs="{'invisible': [('total', '=', 0)]}">
+                            <button name="%(action_mail_mass_mailing_report)d"
+                                type="action" class="oe_stat_button">
+                                <field name="received_ratio" string="Received" widget="percentpie"/>
+                            </button>
+                            <button name="%(action_mail_mass_mailing_report)d"
+                                type="action" class="oe_stat_button">
+                                <field name="opened_ratio" string="Opened" widget="percentpie"/>
+                            </button>
+                            <button name="%(action_mail_mass_mailing_report)d"
+                                type="action" class="oe_stat_button">
+                                <field name="replied_ratio" string="Replied" widget="percentpie"/>
+                            </button>
+                        </div>
+                        <div class="oe_button_box" attrs="{'invisible': [('total', '=', 0)]}" style="margin-bottom: 32px">
+                            <button name="%(action_mail_mass_mailing_report)d" type="action"
+                                icon="fa-envelope-o" class="oe_stat_button">
+                                <field name="total" string="Emails" widget="statinfo"/>
+                            </button>
+                        </div>
                         <group>
-                            <group>
-                                <field name="email_from"/>
-                                <field name="name"/>
-                            </group>
-                            <group>
-                                <div class="oe_right oe_button_box" name="buttons">
-                                    <div>
-                                        <button name="action_see_recipients" type="object"
-                                            icon="fa-user" class="oe_stat_button">
-                                            <field name="contact_nbr" string="Recipients" widget="statinfo"/>
-                                        </button>
-                                        <button name="%(action_mail_mass_mailing_report)d" type="action"
-                                            icon="fa-envelope-o" class="oe_stat_button">
-                                            <field name="total" string="Emails" widget="statinfo"/>
-                                        </button>
-                                    </div>
-                                    <div style="margin-top: 8px;"
-                                        attrs="{'invisible': [('total', '=', 0)]}">
-                                        <button name="%(action_mail_mass_mailing_report)d"
-                                            type="action" class="oe_stat_button">
-                                            <field name="received_ratio" string="Received" widget="percentpie"/>
-                                        </button>
-                                        <button name="%(action_mail_mass_mailing_report)d"
-                                            type="action" class="oe_stat_button">
-                                            <field name="opened_ratio" string="Opened" widget="percentpie"/>
-                                        </button>
-                                        <button name="%(action_mail_mass_mailing_report)d"
-                                            type="action" class="oe_stat_button">
-                                            <field name="replied_ratio" string="Replied" widget="percentpie"/>
-                                        </button>
-                                    </div>
-                                    <div style="margin-top: 8px;"
-                                        attrs="{'invisible': [('total', '=', 0)]}">
-                                        <button name="%(action_mail_mass_mailing_report)d"
-                                            type="action" class="oe_stat_button oe_inline">
-                                            <field name="opened_dayly" string="Opened Daily" widget="barchart"/>
-                                        </button>
-                                        <button name="%(action_mail_mass_mailing_report)d"
-                                            type="action" class="oe_stat_button oe_inline">
-                                            <field name="replied_dayly" string="Replied Daily" widget="barchart"/>
-                                        </button>
-                                    </div>
-                                </div>
-                            </group>
-                        </group>
-                        <group>
-                            <label for="reply_to"/>
-                            <div>
-                                <field name="auto_reply_to_available" invisible="1"/>
-                                <field name="reply_in_thread" class="oe_inline"
-                                    on_change="on_change_reply_in_thread(reply_specified, reply_in_thread, context)"
-                                    attrs="{'readonly': [('auto_reply_to_available', '=', False)]}"/>
-                                <span attrs="{'invisible': [('auto_reply_to_available', '=', False)]}">
-                                    Replies go into the original document
-                                </span>
-                                <span class="oe_grey" attrs="{'invisible': [('auto_reply_to_available', '=', True)]}">
-                                    Replies go into the original document (not available for those recipients)
-                                </span>
-                                <br />
-                                <field name="reply_specified" class="oe_inline"
-                                    on_change="on_change_reply_specified(reply_specified, reply_in_thread, context)"/> Use a specific reply-to address
-                                <field name="reply_to" class="oe_inline"
-                                    style="margin-left: 8px;"
-                                    attrs="{'required': [('reply_specified', '=', True)]}"/>
-                            </div>
+                            <field name="email_from"/>
+                            <field name="name"/>
                             <label for="mailing_model" string="Recipients"/>
                             <div>
-                                <field name="mailing_model" widget="radio"
-                                    on_change='on_change_mailing_model(mailing_model, context)'/>
+                                <field name="mailing_domain" invisible="1"/>
+                                <field name="mailing_model" widget="radio" style="margin-bottom: 8px"
+                                    on_change="on_change_model(mailing_model, contact_list_ids)"/>
 
-                                <label for="contact_list_ids" string="Mailing Lists" style="display: inline-block; min-width: 90px;"/>
-                                <field name="contact_list_ids" widget="many2many_tags" options="{'no_create': True}"
-                                    class="oe_inline" placeholder="Choose mailing lists"
-                                    on_change="on_change_contact_list_ids(mailing_model, contact_list_ids, context)"/>
-                                <span style="margin-left: 8px; margin-right: 8px">or</span>
-                                <button string='Create a New List' class="oe_link" type='object' name='action_new_list'/><br />
-
-                                <field name="contact_ab_pc" groups="mass_mailing.group_mass_mailing_campaign"/>
+                                <div attrs="{'invisible': [('mailing_model', '=', 'mail.mass_mailing.contact')]}">
+                                    <button class="oe_link" type='object' name='action_domain_select' attrs="{'invisible': [('contact_nbr', '&gt;', '0')]}">
+                                        <span class="fa fa-arrow-right"> Select Recipients</span>
+                                    </button>
+                                </div>
+                                <div attrs="{'invisible': [('mailing_model', '&lt;&gt;', 'mail.mass_mailing.contact')]}">
+                                    <label for="contact_list_ids" string="Select mailing lists:" class="oe_edit_only"/>
+                                    <field name="contact_list_ids" widget="many2many_tags"
+                                        placeholder="Select mailing lists..." class="oe_inline"
+                                        on_change="on_change_model(mailing_model, contact_list_ids)"/>
+                                </div>
+                                <div attrs="{'invisible': [('contact_nbr', '&lt;', 1)]}">
+                                    <strong>
+                                        <field name="contact_nbr" class="oe_inline"/> Recipients
+                                    </strong>
+                                    <button class="oe_link" type='object' name='action_domain_select' attrs="{'invisible': [('mailing_model', '=', 'mail.mass_mailing.contact')]}">
+                                        <span class="fa fa-arrow-right"> Change Selection</span>
+                                    </button>
+                                </div>
 
                             </div>
-                            <field name="date" readonly="True" groups="mass_mailing.group_mass_mailing_campaign"
-                                attrs="{'invisible': [('state', '!=', 'done')]}"/>
-                            <field name="mass_mailing_campaign_id" groups="mass_mailing.group_mass_mailing_campaign"/>
-                            <label for="body_html" string="Email"/>
-                            <button name="action_edit_html" type="object" string="Edit Mail Content"
-                                class="oe_link" style="margin-left: 8px"/>
-                            <field name="body_html"/>
                         </group>
+                        <notebook>
+                            <page string="Mail Body">
+                                <button name="action_edit_html" type="object" string="Design Email" class="oe_highlight"/>
+                                <div attrs="{'invisible' : ['|', ('body_html','!=',False), ('contact_nbr', '&lt;', 1)]}" class="oe_view_nocontent oe_clear">
+                                    <p class="oe_view_nocontent_create oe_edit_only">
+                                        Click to design your email.
+                                    </p>
+                                </div>
+                                <field name="body_html" readonly="1"/>
+                            </page><page string="Options">
+                                <group>
+                                    <group string="Campaign" groups="mass_mailing.group_mass_mailing_campaign">
+                                        <field name="mass_mailing_campaign_id"/>
+                                        <label for="contact_ab_pc"/>
+                                        <div>
+                                            <field name="contact_ab_pc" class="oe_inline"/> %
+                                        </div>
+                                    </group><group>
+                                        <field name="date"/>
+                                    </group><group>
+                                        <label for="reply_to"/>
+                                        <div>
+                                            <field name="auto_reply_to_available" invisible="1"/>
+                                            <field name="reply_in_thread" class="oe_inline"
+                                                on_change="on_change_reply_in_thread(reply_specified, reply_in_thread, context)"
+                                                attrs="{'readonly': [('auto_reply_to_available', '=', False)]}"/>
+                                            <span attrs="{'invisible': [('auto_reply_to_available', '=', False)]}">
+                                                Replies go into the original document
+                                            </span>
+                                            <span class="oe_grey" attrs="{'invisible': [('auto_reply_to_available', '=', True)]}">
+                                                Replies go into the original document (not available for those recipients)
+                                            </span>
+                                            <br />
+                                            <field name="reply_specified" class="oe_inline"
+                                                on_change="on_change_reply_specified(reply_specified, reply_in_thread, context)"/> Use a specific reply-to address
+                                            <field name="reply_to" class="oe_inline"
+                                                style="margin-left: 8px;"
+                                                attrs="{'required': [('reply_specified', '=', True)]}"/>
+                                        </div>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
+
+
                     </sheet>
                 </form>
             </field>

From 227b9a917d7a79089ad04515aa86920ebf0f5c7e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Apr 2014 01:25:48 +0200
Subject: [PATCH 03/14] [IMP] Adding stats file

bzr revid: fp@tinyerp.com-20140412232548-csyb7j13fyu4cwnw
---
 .../mass_mailing/models/mass_mailing_stats.py | 350 ++++++++++++++++++
 addons/mass_mailing/views/mass_mailing.xml    |  12 +-
 2 files changed, 356 insertions(+), 6 deletions(-)
 create mode 100644 addons/mass_mailing/models/mass_mailing_stats.py

diff --git a/addons/mass_mailing/models/mass_mailing_stats.py b/addons/mass_mailing/models/mass_mailing_stats.py
new file mode 100644
index 00000000000..a9134c5e574
--- /dev/null
+++ b/addons/mass_mailing/models/mass_mailing_stats.py
@@ -0,0 +1,350 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from datetime import datetime
+from dateutil import relativedelta
+import random
+try:
+    import simplejson as json
+except ImportError:
+    import json
+import urllib
+import urlparse
+
+from openerp import tools
+from openerp.exceptions import Warning
+from openerp.tools.safe_eval import safe_eval as eval
+from openerp.tools.translate import _
+from openerp.osv import osv, fields
+
+class MassMailingList(osv.Model):
+    _inherit = 'mail.mass_mailing.list'
+    def _get_contact_nbr(self, cr, uid, ids, name, arg, context=None):
+        result = dict.fromkeys(ids, 0)
+        mlc = self.pool.get('mail.mass_mailing.contact')
+        for m in mlc.read_group(cr, uid, [('list_id','in',ids)], ['list_id'], ['list_id'], context=context):
+            result[m['list_id'][0]] = m['list_id_count']
+        return result
+
+    _columns = {
+        'contact_nbr': fields.function(
+            _get_contact_nbr, type='integer',
+            string='Number of Contacts',
+        ),
+    }
+
+
+class MassMailingCampaign(osv.Model):
+    _inherit = "mail.mass_mailing.campaign"
+    def _get_statistics(self, cr, uid, ids, name, arg, context=None):
+        """ Compute statistics of the mass mailing campaign """
+        Statistics = self.pool['mail.mail.statistics']
+        results = dict.fromkeys(ids, False)
+        for cid in ids:
+            stat_ids = Statistics.search(cr, uid, [('mass_mailing_campaign_id', '=', cid)], context=context)
+            stats = Statistics.browse(cr, uid, stat_ids, context=context)
+            results[cid] = {
+                'total': len(stats),
+                'failed': len([s for s in stats if not s.scheduled is False and s.sent is False and not s.exception is False]),
+                'scheduled': len([s for s in stats if not s.scheduled is False and s.sent is False and s.exception is False]),
+                'sent': len([s for s in stats if not s.sent is False]),
+                'opened': len([s for s in stats if not s.opened is False]),
+                'replied': len([s for s in stats if not s.replied is False]),
+                '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)
+        return results
+
+    _columns = {
+        'total': fields.function(
+            _get_statistics, string='Total',
+            type='integer', multi='_get_statistics'
+        ),
+        'scheduled': fields.function(
+            _get_statistics, string='Scheduled',
+            type='integer', multi='_get_statistics'
+        ),
+        'failed': fields.function(
+            _get_statistics, string='Failed',
+            type='integer', multi='_get_statistics'
+        ),
+        'sent': fields.function(
+            _get_statistics, string='Sent Emails',
+            type='integer', multi='_get_statistics'
+        ),
+        'delivered': fields.function(
+            _get_statistics, string='Delivered',
+            type='integer', multi='_get_statistics',
+        ),
+        'opened': fields.function(
+            _get_statistics, string='Opened',
+            type='integer', multi='_get_statistics',
+        ),
+        'replied': fields.function(
+            _get_statistics, string='Replied',
+            type='integer', multi='_get_statistics'
+        ),
+        'bounced': fields.function(
+            _get_statistics, string='Bounced',
+            type='integer', multi='_get_statistics'
+        ),
+        'received_ratio': fields.function(
+            _get_statistics, string='Received Ratio',
+            type='integer', multi='_get_statistics',
+        ),
+        'opened_ratio': fields.function(
+            _get_statistics, string='Opened Ratio',
+            type='integer', multi='_get_statistics',
+        ),
+        'replied_ratio': fields.function(
+            _get_statistics, string='Replied Ratio',
+            type='integer', multi='_get_statistics',
+        ),
+    }
+
+
+class MassMailing(osv.Model):
+    _inherit = 'mail.mass_mailing'
+    _period_number = 6
+    def __get_bar_values(self, cr, uid, id, obj, domain, read_fields, value_field, groupby_field, context=None):
+        """ Generic method to generate data for bar chart values using SparklineBarWidget.
+            This method performs obj.read_group(cr, uid, domain, read_fields, groupby_field).
+
+            :param obj: the target model (i.e. crm_lead)
+            :param domain: the domain applied to the read_group
+            :param list read_fields: the list of fields to read in the read_group
+            :param str value_field: the field used to compute the value of the bar slice
+            :param str groupby_field: the fields used to group
+
+            :return list section_result: a list of dicts: [
+                                                {   'value': (int) bar_column_value,
+                                                    'tootip': (str) bar_column_tooltip,
+                                                }
+                                            ]
+        """
+        date_begin = datetime.strptime(self.browse(cr, uid, id, context=context).date, tools.DEFAULT_SERVER_DATETIME_FORMAT).date()
+        section_result = [{'value': 0,
+                           'tooltip': (date_begin + relativedelta.relativedelta(days=i)).strftime('%d %B %Y'),
+                           } for i in range(0, self._period_number)]
+        group_obj = obj.read_group(cr, uid, domain, read_fields, groupby_field, context=context)
+        field_col_info = obj._all_columns.get(groupby_field.split(':')[0])
+        pattern = tools.DEFAULT_SERVER_DATE_FORMAT if field_col_info.column._type == 'date' else tools.DEFAULT_SERVER_DATETIME_FORMAT
+        for group in group_obj:
+            group_begin_date = datetime.strptime(group['__domain'][0][2], pattern).date()
+            timedelta = relativedelta.relativedelta(group_begin_date, date_begin)
+            section_result[timedelta.days] = {'value': group.get(value_field, 0), 'tooltip': group.get(groupby_field)}
+        return section_result
+
+    def _get_daily_statistics(self, cr, uid, ids, field_name, arg, context=None):
+        """ Get the daily statistics of the mass mailing. This is done by a grouping
+        on opened and replied fields. Using custom format in context, we obtain
+        results for the next 6 days following the mass mailing date. """
+        obj = self.pool['mail.mail.statistics']
+        res = {}
+        for id in ids:
+            res[id] = {}
+            date_begin = datetime.strptime(self.browse(cr, uid, id, context=context).date, tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            date_end = date_begin + relativedelta.relativedelta(days=self._period_number - 1)
+            date_begin_str = date_begin.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            date_end_str = date_end.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            domain = [('mass_mailing_id', '=', id), ('opened', '>=', date_begin_str), ('opened', '<=', date_end_str)]
+            res[id]['opened_dayly'] = json.dumps(self.__get_bar_values(cr, uid, id, obj, domain, ['opened'], 'opened_count', 'opened:day', context=context))
+            domain = [('mass_mailing_id', '=', id), ('replied', '>=', date_begin_str), ('replied', '<=', date_end_str)]
+            res[id]['replied_dayly'] = json.dumps(self.__get_bar_values(cr, uid, id, obj, domain, ['replied'], 'replied_count', 'replied:day', context=context))
+        return res
+
+    def _get_statistics(self, cr, uid, ids, name, arg, context=None):
+        """ Compute statistics of the mass mailing campaign """
+        Statistics = self.pool['mail.mail.statistics']
+        results = dict.fromkeys(ids, False)
+        for mid in ids:
+            stat_ids = Statistics.search(cr, uid, [('mass_mailing_id', '=', mid)], context=context)
+            stats = Statistics.browse(cr, uid, stat_ids, context=context)
+            results[mid] = {
+                'total': len(stats),
+                'failed': len([s for s in stats if not s.scheduled is False and s.sent is False and not s.exception is False]),
+                'scheduled': len([s for s in stats if not s.scheduled is False and s.sent is False and s.exception is False]),
+                'sent': len([s for s in stats if not s.sent is False]),
+                'opened': len([s for s in stats if not s.opened is False]),
+                'replied': len([s for s in stats if not s.replied is False]),
+                '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)
+        return results
+
+    # To improve
+    def _get_contact_nbr(self, cr, uid, ids, name, arg, context=None):
+        res = dict.fromkeys(ids, False)
+        for mailing in self.browse(cr, uid, ids, context=context):
+            if not mailing.mailing_domain:
+                res[mailing.id] = 0
+                continue
+            print mailing.mailing_model, mailing.mailing_domain
+            res[mailing.id] = self.pool[mailing.mailing_model].search(
+                cr, uid, eval(mailing.mailing_domain), count=True, context=context
+            )
+        return res
+
+    _columns = {
+        'contact_nbr': fields.function(_get_contact_nbr, type='integer', string='Contact Number'),
+        # statistics data
+        'statistics_ids': fields.one2many(
+            'mail.mail.statistics', 'mass_mailing_id',
+            'Emails Statistics',
+        ),
+        'total': fields.function(
+            _get_statistics, string='Total',
+            type='integer', multi='_get_statistics',
+        ),
+        'scheduled': fields.function(
+            _get_statistics, string='Scheduled',
+            type='integer', multi='_get_statistics',
+        ),
+        'failed': fields.function(
+            _get_statistics, string='Failed',
+            type='integer', multi='_get_statistics',
+        ),
+        'sent': fields.function(
+            _get_statistics, string='Sent',
+            type='integer', multi='_get_statistics',
+        ),
+        'delivered': fields.function(
+            _get_statistics, string='Delivered',
+            type='integer', multi='_get_statistics',
+        ),
+        'opened': fields.function(
+            _get_statistics, string='Opened',
+            type='integer', multi='_get_statistics',
+        ),
+        'replied': fields.function(
+            _get_statistics, string='Replied',
+            type='integer', multi='_get_statistics',
+        ),
+        'bounced': fields.function(
+            _get_statistics, string='Bounced',
+            type='integer', multi='_get_statistics',
+        ),
+        'received_ratio': fields.function(
+            _get_statistics, string='Received Ratio',
+            type='integer', multi='_get_statistics',
+        ),
+        'opened_ratio': fields.function(
+            _get_statistics, string='Opened Ratio',
+            type='integer', multi='_get_statistics',
+        ),
+        'replied_ratio': fields.function(
+            _get_statistics, string='Replied Ratio',
+            type='integer', multi='_get_statistics',
+        ),
+        # dayly ratio
+        'opened_dayly': fields.function(
+            _get_daily_statistics, string='Opened',
+            type='char', multi='_get_daily_statistics',
+            oldname='opened_monthly',
+        ),
+        'replied_dayly': fields.function(
+            _get_daily_statistics, string='Replied',
+            type='char', multi='_get_daily_statistics',
+            oldname='replied_monthly',
+        ),
+    }
+
+
+
+
+# Merge this on emails
+class MailMailStats(osv.Model):
+    """ MailMailStats models the statistics collected about emails. Those statistics
+    are stored in a separated model and table to avoid bloating the mail_mail table
+    with statistics values. This also allows to delete emails send with mass mailing
+    without loosing the statistics about them. """
+
+    _name = 'mail.mail.statistics'
+    _description = 'Email Statistics'
+    _rec_name = 'message_id'
+    _order = 'message_id'
+
+    _columns = {
+        'mail_mail_id': fields.integer(
+            'Mail ID',
+            help='ID of the related mail_mail. This field is an integer field because'
+                 'the related mail_mail can be deleted separately from its statistics.'
+        ),
+        'message_id': fields.char('Message-ID'),
+        'model': fields.char('Document model'),
+        'res_id': fields.integer('Document ID'),
+        # campaign / wave data
+        'mass_mailing_id': fields.many2one(
+            'mail.mass_mailing', 'Mass Mailing',
+            ondelete='set null',
+        ),
+        'mass_mailing_campaign_id': fields.related(
+            'mass_mailing_id', 'mass_mailing_campaign_id',
+            type='many2one', ondelete='set null',
+            relation='mail.mass_mailing.campaign',
+            string='Mass Mailing Campaign',
+            store=True, readonly=True,
+        ),
+        # Bounce and tracking
+        'scheduled': fields.datetime('Scheduled', help='Date when the email has been created'),
+        'sent': fields.datetime('Sent', help='Date when the email has been sent'),
+        'exception': fields.datetime('Exception', help='Date of technical error leading to the email not being sent'),
+        'opened': fields.datetime('Opened', help='Date when the email has been opened the first time'),
+        'replied': fields.datetime('Replied', help='Date when this email has been replied for the first time.'),
+        'bounced': fields.datetime('Bounced', help='Date when this email has bounced.'),
+    }
+
+    _defaults = {
+        'scheduled': fields.datetime.now,
+    }
+
+    def _get_ids(self, cr, uid, ids=None, mail_mail_ids=None, mail_message_ids=None, domain=None, context=None):
+        if not ids and mail_mail_ids:
+            base_domain = [('mail_mail_id', 'in', mail_mail_ids)]
+        elif not ids and mail_message_ids:
+            base_domain = [('message_id', 'in', mail_message_ids)]
+        else:
+            base_domain = [('id', 'in', ids or [])]
+        if domain:
+            base_domain = ['&'] + domain + base_domain
+        return self.search(cr, uid, base_domain, context=context)
+
+    def set_opened(self, cr, uid, ids=None, mail_mail_ids=None, mail_message_ids=None, context=None):
+        stat_ids = self._get_ids(cr, uid, ids, mail_mail_ids, mail_message_ids, [('opened', '=', False)], context)
+        self.write(cr, uid, stat_ids, {'opened': fields.datetime.now()}, context=context)
+        return stat_ids
+
+    def set_replied(self, cr, uid, ids=None, mail_mail_ids=None, mail_message_ids=None, context=None):
+        stat_ids = self._get_ids(cr, uid, ids, mail_mail_ids, mail_message_ids, [('replied', '=', False)], context)
+        self.write(cr, uid, stat_ids, {'replied': fields.datetime.now()}, context=context)
+        return stat_ids
+
+    def set_bounced(self, cr, uid, ids=None, mail_mail_ids=None, mail_message_ids=None, context=None):
+        stat_ids = self._get_ids(cr, uid, ids, mail_mail_ids, mail_message_ids, [('bounced', '=', False)], context)
+        self.write(cr, uid, stat_ids, {'bounced': fields.datetime.now()}, context=context)
+        return stat_ids
+
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 52f55eaed35..6e1f73a0965 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -185,13 +185,13 @@
                             class="oe_highlight" string="Send to All"/>
                         <field name="state" widget="statusbar"/>
                     </header>
+                    <div class="oe_form_box_info oe_text_center" attrs="{'invisible': [('scheduled', '=', 0)]}">
+                        <p><strong>
+                            <field name="scheduled" class="oe_inline"/>emails are in queue
+                            and will be sent soon.
+                        </strong></p>
+                    </div>
                     <sheet>
-                        <div class="oe_form_box_info oe_text_center" attrs="{'invisible': [('scheduled', '=', 0)]}">
-                            <p>
-                                <strong><field name="scheduled" class="oe_inline"/>emails are in queue
-                                and will be sent soon.</strong>
-                            </p>
-                        </div>
 
                         <div class="oe_button_box pull-right" attrs="{'invisible': [('total', '=', 0)]}">
                             <button name="%(action_mail_mass_mailing_report)d"

From 84fe98085b5810d7b46228734656d23d1990bfae Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Apr 2014 01:30:19 +0200
Subject: [PATCH 04/14] [IMP] Adding stats file

bzr revid: fp@tinyerp.com-20140412233019-au2omxtet5sfqcxr
---
 addons/mass_mailing/models/mass_mailing.py       | 5 +++--
 addons/mass_mailing/models/mass_mailing_stats.py | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 83ceefeaa48..61405da1a7a 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -217,10 +217,11 @@ class MassMailing(osv.Model):
         if mailing_model=='mail.mass_mailing.contact':
             if list_ids and list_ids[0][0]==6 and list_ids[0][2]:
                 value['mailing_domain'] = "[('list_id', 'in', ["+','.join(map(str, list_ids[0][2]))+"])]"
-                value['contact_nbr'] = 5
             else:
                 value['mailing_domain'] = "[('list_id', '=', False)]"
-                value['contact_nbr'] = 0
+            value['contact_nbr'] = self.pool[mailing_model].search(
+                cr, uid, eval(value['mailing_domain']), count=True, context=context
+            )
         else:
             value['mailing_domain'] = False
             value['contact_nbr'] = 0
diff --git a/addons/mass_mailing/models/mass_mailing_stats.py b/addons/mass_mailing/models/mass_mailing_stats.py
index a9134c5e574..f002a6f0c7f 100644
--- a/addons/mass_mailing/models/mass_mailing_stats.py
+++ b/addons/mass_mailing/models/mass_mailing_stats.py
@@ -203,7 +203,6 @@ class MassMailing(osv.Model):
             if not mailing.mailing_domain:
                 res[mailing.id] = 0
                 continue
-            print mailing.mailing_model, mailing.mailing_domain
             res[mailing.id] = self.pool[mailing.mailing_model].search(
                 cr, uid, eval(mailing.mailing_domain), count=True, context=context
             )

From cb544e61c4b0afe6a13c33f71a0b1e51b5e3a904 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Apr 2014 09:09:22 +0200
Subject: [PATCH 05/14] [IMP] default recipients to mailing list

bzr revid: fp@tinyerp.com-20140413070922-jw7f5s9wrt9g2gek
---
 addons/mass_mailing/models/mass_mailing.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 61405da1a7a..b24568f972c 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -175,7 +175,7 @@ class MassMailing(osv.Model):
         'reply_to': fields.char('Reply To'),
 
         # Target Emails
-        'mailing_model': fields.selection(_get_mailing_model, string='Recipients Model'),
+        'mailing_model': fields.selection(_get_mailing_model, string='Recipients Model', required=True),
         'mailing_domain': fields.char('Domain'),
         'contact_list_ids': fields.many2many(
             'mail.mass_mailing.list', 'mail_mass_mailing_list_rel',
@@ -191,7 +191,7 @@ class MassMailing(osv.Model):
         'state': 'draft',
         'date': fields.datetime.now,
         'email_from': lambda self, cr, uid, ctx=None: self.pool['mail.message']._get_default_from(cr, uid, context=ctx),
-        'mailing_model': 'res.partner',
+        'mailing_model': 'mail.mass_mailing.contact',
         'contact_ab_pc': 100,
     }
 

From f908137d768771ddf58cca0346727d12185f21a8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Apr 2014 18:20:28 +0200
Subject: [PATCH 06/14] [IMP] Template Editor

bzr revid: fp@tinyerp.com-20140413162028-9tqqzis7qbggcrp4
---
 addons/mass_mailing/__openerp__.py            |  4 +-
 addons/mass_mailing/models/mass_mailing.py    |  4 +-
 .../static/src/js/mass_mailing.js             | 73 +++++++++++++++--
 .../static/src/xml/mass_mailing.xml           | 13 +++
 addons/mass_mailing/views/mass_mailing.xml    | 13 ++-
 .../controllers/email_designer.py             | 26 +++---
 .../static/src/css/website_mail.css           | 17 +++-
 .../static/src/js/website_email_designer.js   | 17 +++-
 .../views/website_email_designer.xml          | 82 ++++++++++---------
 9 files changed, 179 insertions(+), 70 deletions(-)
 create mode 100644 addons/mass_mailing/static/src/xml/mass_mailing.xml

diff --git a/addons/mass_mailing/__openerp__.py b/addons/mass_mailing/__openerp__.py
index 2ab0b42e3a7..ca9ea76a7bd 100644
--- a/addons/mass_mailing/__openerp__.py
+++ b/addons/mass_mailing/__openerp__.py
@@ -54,7 +54,9 @@ professional emails and reuse templates in a few clicks.
     'js': [
         'static/src/js/mass_mailing.js',
     ],
-    'qweb': [],
+    'qweb' : [
+        'static/src/xml/*.xml',
+    ],
     'css': [
         'static/src/css/mass_mailing.css',
         'static/src/css/email_template.css'
diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index b24568f972c..1cfa28cd208 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -319,7 +319,9 @@ class MassMailing(osv.Model):
         }
 
     def action_edit_html(self, cr, uid, ids, context=None):
-        url = '/website_mail/email_designer?model=mail.mass_mailing&res_id=%d' % ids[0]
+        assert len(ids)==1, "One and only one ID allowed for this action"
+        mail = self.browse(cr, uid, ids[0], context=context)
+        url = '/website_mail/email_designer?model=mail.mass_mailing&res_id=%d&field_body=body_html&field_from=email_form&field_subject=name&template_model=%s' % (ids[0], mail.mailing_model)
         return {
             'name': _('Open with Visual Editor'),
             'type': 'ir.actions.act_url',
diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
index c0dc621984f..7a52b785714 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -1,13 +1,70 @@
-openerp.mass_mailing = function(openerp) {
+openerp.mass_mailing = function (instance) {
+    var _t = instance.web._t;
+	debugger;
 
-    openerp.web_kanban.KanbanRecord.include({
-        on_card_clicked: function (event) {
-            if (this.view.dataset.model === 'mail.mass_mailing.campaign') {
-                this.$('.oe_mailings').click();
-            } else {
-                this._super.apply(this, arguments);
-            }
+    openerp.mass_mailing = function(openerp) {
+        openerp.web_kanban.KanbanRecord.include({
+            on_card_clicked: function (event) {
+                if (this.view.dataset.model === 'mail.mass_mailing.campaign') {
+                    this.$('.oe_mailings').click();
+                } else {
+                    this._super.apply(this, arguments);
+                }
+            },
+        });
+    };
+
+    instance.web.form.CharDomainButton = instance.web.form.AbstractField.extend({
+        template: 'CharDomainButton',
+        init: function(field_manager, node) {
+            this._super.apply(this, arguments);
         },
+        start: function() {
+            var self=this;
+            this._super.apply(this, arguments);
+            $('button', this.$el).on('click', self.on_click);
+            this.set_button();
+        },
+        set_button: function() {
+            if (this.get('value')) {
+                // TODO: rpc to copute X
+                $('.oe_domain_count', this.$el).text('X records selected');
+                $('button span', this.$el).text(' Change selection');
+            } else {
+                $('.oe_domain_count', this.$el).text('0 record selected');
+                $('button span', this.$el).text(' Select records');
+            };
+        },
+        on_click: function(ev) {
+            var self = this;
+            var model = this.options.model || this.field_manager.get_field_value(this.options.model_field);
+            this.pop = new instance.web.form.SelectCreatePopup(this);
+            this.pop.select_element(
+                model, {title: 'Select records...'},
+                [], this.build_context());
+            this.pop.on("elements_selected", self, function() {
+                var self2 = this;
+                var search_data = this.pop.searchview.build_search_data()
+                instance.web.pyeval.eval_domains_and_contexts({
+                    domains: search_data.domains,
+                    contexts: search_data.contexts,
+                    group_by_seq: search_data.groupbys || []
+                }).then(function (results) {
+                    var domain = self2.pop.dataset.domain.concat(results.domain || []);
+                    self.set_value(JSON.stringify(domain))
+                });
+            });
+            event.preventDefault();
+        },
+        set_value: function(value_) {
+            var self = this;
+            this.set('value', value_ || false);
+            this.set_button();
+         },
     });
 
+    instance.web.form.widgets = instance.web.form.widgets.extend(
+        {'char_domain': 'instance.web.form.CharDomainButton'}
+    );
+
 };
diff --git a/addons/mass_mailing/static/src/xml/mass_mailing.xml b/addons/mass_mailing/static/src/xml/mass_mailing.xml
new file mode 100644
index 00000000000..2b20e450113
--- /dev/null
+++ b/addons/mass_mailing/static/src/xml/mass_mailing.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+    <t t-name="CharDomainButton">
+        <div class="oe_form_field">
+            <span class="oe_domain_count"/>
+            <button class="oe_button oe_link" type="button"
+                t-att-style="widget.node.attrs.style"
+                t-att-accesskey="widget.node.attrs.accesskey">
+                <span class="fa fa-arrow-right"/>
+            </button>
+        </div>
+    </t>
+</template>
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 6e1f73a0965..7af3231b45e 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -218,15 +218,14 @@
                             <field name="name"/>
                             <label for="mailing_model" string="Recipients"/>
                             <div>
-                                <field name="mailing_domain" invisible="1"/>
                                 <field name="mailing_model" widget="radio" style="margin-bottom: 8px"
                                     on_change="on_change_model(mailing_model, contact_list_ids)"/>
 
-                                <div attrs="{'invisible': [('mailing_model', '=', 'mail.mass_mailing.contact')]}">
-                                    <button class="oe_link" type='object' name='action_domain_select' attrs="{'invisible': [('contact_nbr', '&gt;', '0')]}">
-                                        <span class="fa fa-arrow-right"> Select Recipients</span>
-                                    </button>
-                                </div>
+                                <field name="mailing_domain" widget="char_domain"
+                                    attrs="{'invisible': [('mailing_model', '=', 'mail.mass_mailing.contact')]}"
+                                    placeholder="Select recipients"
+                                    options="{'model_field': 'mailing_model'}"/>
+
                                 <div attrs="{'invisible': [('mailing_model', '&lt;&gt;', 'mail.mass_mailing.contact')]}">
                                     <label for="contact_list_ids" string="Select mailing lists:" class="oe_edit_only"/>
                                     <field name="contact_list_ids" widget="many2many_tags"
@@ -247,7 +246,7 @@
                         <notebook>
                             <page string="Mail Body">
                                 <button name="action_edit_html" type="object" string="Design Email" class="oe_highlight"/>
-                                <div attrs="{'invisible' : ['|', ('body_html','!=',False), ('contact_nbr', '&lt;', 1)]}" class="oe_view_nocontent oe_clear">
+                                <div attrs="{'invisible' : ['|', ('body_html','!=',False), ('mailing_domain', '!=', False)]}" class="oe_view_nocontent oe_clear">
                                     <p class="oe_view_nocontent_create oe_edit_only">
                                         Click to design your email.
                                     </p>
diff --git a/addons/website_mail/controllers/email_designer.py b/addons/website_mail/controllers/email_designer.py
index e44782227b4..88fb147f365 100644
--- a/addons/website_mail/controllers/email_designer.py
+++ b/addons/website_mail/controllers/email_designer.py
@@ -8,20 +8,24 @@ from openerp.addons.web.http import request
 class WebsiteEmailDesigner(http.Controller):
 
     @http.route('/website_mail/email_designer', type='http', auth="user", website=True, multilang=True)
-    def index(self, model=None, res_id=None, **kw):
-        if not model or not model in request.registry or not res_id:
-            return request.redirect('/')
-        if not 'body' in request.registry[model]._all_columns and not 'body_html' in request.registry[model]._all_columns:
-            return request.redirect('/')
-        obj_ids = request.registry[model].exists(request.cr, request.uid, [res_id], context=request.context)
-        if not obj_ids:
-            return request.redirect('/')
+    def index(self, model, res_id, template_model, field_body='body', field_from='email_from', field_subject='name', **kw):
+        cr, uid, context = request.cr, request.uid, request.context
+        tmpl_obj = request.registry['email.template']
+        res_id = int(res_id)
+
+        tids = tmpl_obj.search(cr, uid, [('model','=',template_model)], context=context)
+        templates = tmpl_obj.browse(cr, uid, tids, context=context)
+
         values = {
-            'object': request.registry[model].browse(request.cr, request.uid, obj_ids[0], context=request.context),
-            'model': request.registry[model],
-            'model_name': model,
+            'object': request.registry[model].browse(cr, uid, res_id, context=context),
+            'templates': templates,
+            'model': model,
             'res_id': res_id,
+            'field_body': field_body,
+            'field_from': field_from,
+            'field_subject': field_subject,
         }
+        print '*', values
         return request.website.render("website_mail.designer_index", values)
 
     @http.route(['/website_mail/snippets'], type='json', auth="user", website=True)
diff --git a/addons/website_mail/static/src/css/website_mail.css b/addons/website_mail/static/src/css/website_mail.css
index 5678442416c..b3c6b7ed942 100644
--- a/addons/website_mail/static/src/css/website_mail.css
+++ b/addons/website_mail/static/src/css/website_mail.css
@@ -1,4 +1,19 @@
 .js_follow[data-follow='on'] .js_follow_btn ,
 .js_follow[data-follow='off'] .js_unfollow_btn {
     display: none;
-}
\ No newline at end of file
+}
+
+.email_preview_border {
+    overflow:                 hidden !important;
+    border:                   2px solid grey;
+    height:                   300px;
+}
+.email_preview {
+    -webkit-transform:        scale(.50);
+    -ms-transform:            scale(.50);
+    transform:                scale(.50);
+    -webkit-transform-origin: 0 0; 
+    -ms-transform-origin:     0 0; 
+    transform-origin:         0 0; 
+    margin:                   0 0px -300px 0;
+}
diff --git a/addons/website_mail/static/src/js/website_email_designer.js b/addons/website_mail/static/src/js/website_email_designer.js
index 25577004700..b023f08eb5a 100644
--- a/addons/website_mail/static/src/js/website_email_designer.js
+++ b/addons/website_mail/static/src/js/website_email_designer.js
@@ -1,17 +1,26 @@
 (function () {
     'use strict';
-
     var website = openerp.website;
 
     website.snippet.BuildingBlock.include({
-
         // init: function (parent) {
         //     this._super.apply(this, arguments);
         // },
-
         _get_snippet_url: function () {
             return '/website_mail/snippets';
         }
-
     });
+
+    // Copy the template to the body of the email
+    $(document).ready(function () {
+        $('.js_template_set').click(function(ev) {
+            $('#email_designer').show();
+            $('#email_template').hide();
+            $(".js_content", $(this).parent()).children().clone().appendTo('#email_body');
+
+            // Todo: switch to edit mode
+            event.preventDefault();
+        });
+    });
+
 })();
diff --git a/addons/website_mail/views/website_email_designer.xml b/addons/website_mail/views/website_email_designer.xml
index 54d9c3fc78e..c1fa5482869 100644
--- a/addons/website_mail/views/website_email_designer.xml
+++ b/addons/website_mail/views/website_email_designer.xml
@@ -8,47 +8,55 @@
         <t t-set="head">
             <script type="text/javascript" src="/website_mail/static/src/js/website_email_designer.js"></script>
         </t>
-        <div id="wrap">
-            <div class="container">
+        <div id="wrap" class="container">
+            <div id="email_template" t-att-style="(object.body_html and len(templates&gt;0)) and 'display: none'" class="mb32">
+                <a class="mt16 btn btn-default pull-right" 
+                  t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s&amp;view_type=form' % (model_name, res_id)">
+                    Back
+                </a>
+                <h1 class="page-header mt16">
+                    Choose an Email Template
+                </h1>
                 <div class="row">
-                    <div class="col-md-8">
-                        <a class="pull-right mt32"
-                                t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s&amp;view_type=form' % (model_name, res_id)">
-                            <button class="btn btn-primary">Back to Form</button>
-                        </a>
-                        <h1 t-field="object.name"/>
-                        <div class="row" style="width: 600px;">
-                            <div t-if="'email_from' in model._all_columns" class="row">
-                                <div class="col-lg-3"><b>Email From</b></div>
-                                <div class="col-lg-9"><span t-field="object.email_from"/></div>
-                            </div>
-
-                            <div t-if="'email_to' in model._all_columns" class="row">
-                                <div class="col-lg-3"><b>To (Email)</b></div>
-                                <div class="col-lg-9"><span t-field="object.email_to"/></div>
-                            </div>
-
-                            <div t-if="'partner_to' in model._all_columns" class="row">
-                                <div class="col-lg-3"><b>To (Partners)</b></div>
-                                <div class="col-lg-9"><span t-field="object.partner_to"/></div>
-                            </div>
-
-                            <div t-if="'reply_to' in model._all_columns" class="row">
-                                <div class="col-lg-3"><b>Reply To</b></div>
-                                <div class="col-lg-9"><span t-field="object.reply_to"/></div>
-                            </div>
-
-                            <div t-if="'subject' in model._all_columns" class="row">
-                                <div class="col-lg-3"><b>Subject</b></div>
-                                <div class="col-lg-9"><span t-field="object.subject"/></div>
-                            </div>
-
-                            <div class="row well">
-                                <div t-field="object.body_html" style="position: relative;"/>
-                            </div>
+                    <div class="col-md-3 col-sm-4 text-center img-border">
+                        <div class="email_preview_border">
+                            <div class="email_preview js_content"/>
+                        </div>
+                        <h4>New Template</h4>
+                        <button class="btn btn-primary">Select</button>
+                    </div>
+                    <div t-foreach="templates" t-as="template" class="col-md-3 col-sm-4 text-center">
+                        <div class="email_preview_border">
+                            <div t-field="template.body_html" class="email_preview js_content"/>
+                        </div>
+                        <h4 t-field="template.name"/>
+                        <button class="btn btn-primary js_template_set">Select</button>
+                    </div>
+                </div>
+            </div><div id="email_designer" t-att-style="not (object.body_html and len(templates)&gt; 0) and 'display: none'" class="mb32">
+                <a class="mt16 btn btn-primary pull-right" 
+                  t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s&amp;view_type=form' % (model_name, res_id)">
+                    Save and Continue
+                </a>
+                <h1 class="page-header mt16">
+                    Design Your Email
+                </h1>
+                <div class="form-horizontal">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">From:</label>
+                        <div class="col-sm-7">
+                            <span t-field="object.email_from" class="form-control"/>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">Subject:</label>
+                        <div class="col-sm-7">
+                            <span t-field="object.name" class="form-control"/>
                         </div>
                     </div>
                 </div>
+                <hr/>
+                <div t-field="object.body_html" id="email_body"/>
             </div>
         </div>
     </t>

From 8d6e2b4a15bc6378ca8b7ae89e33c240665fa589 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Apr 2014 21:57:30 +0200
Subject: [PATCH 07/14] [iMP] minor bugfixes

bzr revid: fp@tinyerp.com-20140413195730-zpzpsmo53fqa4x96
---
 addons/website_mail/controllers/email_designer.py    | 1 +
 addons/website_mail/views/website_email_designer.xml | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/website_mail/controllers/email_designer.py b/addons/website_mail/controllers/email_designer.py
index 88fb147f365..26b025a2abe 100644
--- a/addons/website_mail/controllers/email_designer.py
+++ b/addons/website_mail/controllers/email_designer.py
@@ -16,6 +16,7 @@ class WebsiteEmailDesigner(http.Controller):
         tids = tmpl_obj.search(cr, uid, [('model','=',template_model)], context=context)
         templates = tmpl_obj.browse(cr, uid, tids, context=context)
 
+        print templates
         values = {
             'object': request.registry[model].browse(cr, uid, res_id, context=context),
             'templates': templates,
diff --git a/addons/website_mail/views/website_email_designer.xml b/addons/website_mail/views/website_email_designer.xml
index c1fa5482869..9316d732e8c 100644
--- a/addons/website_mail/views/website_email_designer.xml
+++ b/addons/website_mail/views/website_email_designer.xml
@@ -8,10 +8,10 @@
         <t t-set="head">
             <script type="text/javascript" src="/website_mail/static/src/js/website_email_designer.js"></script>
         </t>
-        <div id="wrap" class="container">
-            <div id="email_template" t-att-style="(object.body_html and len(templates&gt;0)) and 'display: none'" class="mb32">
+        <div id="wrap" class="container" t-ignore="True">
+            <div id="email_template" t-att-style="(object.body_html and len(templates)&gt;0) and 'display: none'" class="mb32">
                 <a class="mt16 btn btn-default pull-right" 
-                  t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s&amp;view_type=form' % (model_name, res_id)">
+                  t-attf-href="/web#return_label=Website&amp;model=#{model}&amp;id=#{res_id}&amp;view_type=form">
                     Back
                 </a>
                 <h1 class="page-header mt16">
@@ -35,7 +35,7 @@
                 </div>
             </div><div id="email_designer" t-att-style="not (object.body_html and len(templates)&gt; 0) and 'display: none'" class="mb32">
                 <a class="mt16 btn btn-primary pull-right" 
-                  t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s&amp;view_type=form' % (model_name, res_id)">
+                  t-attf-href="/web#return_label=Website&amp;model=#{model}&amp;id=#{res_id}&amp;view_type=form">
                     Save and Continue
                 </a>
                 <h1 class="page-header mt16">

From b1ccd5636897e721f652e551c80ce7b13c87dc00 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Apr 2014 22:17:48 +0200
Subject: [PATCH 08/14] [IMP] better usability

bzr revid: fp@tinyerp.com-20140413201748-u8e26ef40dt7360i
---
 .../mass_mailing/models/mass_mailing_stats.py  |  2 +-
 addons/mass_mailing/views/mass_mailing.xml     | 18 +++++++++---------
 addons/mass_mailing/wizard/test_mailing.py     | 15 ++++++---------
 addons/mass_mailing/wizard/test_mailing.xml    |  7 +++++--
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/addons/mass_mailing/models/mass_mailing_stats.py b/addons/mass_mailing/models/mass_mailing_stats.py
index f002a6f0c7f..0dc31b5671a 100644
--- a/addons/mass_mailing/models/mass_mailing_stats.py
+++ b/addons/mass_mailing/models/mass_mailing_stats.py
@@ -40,7 +40,7 @@ class MassMailingList(osv.Model):
     def _get_contact_nbr(self, cr, uid, ids, name, arg, context=None):
         result = dict.fromkeys(ids, 0)
         mlc = self.pool.get('mail.mass_mailing.contact')
-        for m in mlc.read_group(cr, uid, [('list_id','in',ids)], ['list_id'], ['list_id'], context=context):
+        for m in mlc.read_group(cr, uid, [('list_id','in',ids),('opt_out','!=',1)], ['list_id'], ['list_id'], context=context):
             result[m['list_id'][0]] = m['list_id_count']
         return result
 
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 7af3231b45e..3a4e47b405c 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -87,7 +87,7 @@
             <field name="res_model">mail.mass_mailing.contact</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree</field>
-            <field name="context">{'search_default_list_id': active_id}</field>
+            <field name="context">{'search_default_list_id': active_id, 'search_default_not_opt_out': 1}</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to create a recipient.
@@ -180,15 +180,17 @@
                 <form string="Mass Mailing" version="7.0">
                     <header>
                         <button name="action_test_mailing" type="object"
-                            class="oe_highlight" string="Test Mailing"/>
-                        <button name="send_mail" type="object"
+                            class="oe_highlight" string="Test Mailing" states="draft"/>
+                        <button name="send_mail" type="object" states="draft,test"
                             class="oe_highlight" string="Send to All"/>
+                        <button name="action_test_mailing" type="object" states="test,done"
+                            string="Send Test Sample"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <div class="oe_form_box_info oe_text_center" attrs="{'invisible': [('scheduled', '=', 0)]}">
                         <p><strong>
-                            <field name="scheduled" class="oe_inline"/>emails are in queue
-                            and will be sent soon.
+                            <field name="scheduled" class="oe_inline"/>
+                            emails are in queue and will be sent soon.
                         </strong></p>
                     </div>
                     <sheet>
@@ -236,16 +238,14 @@
                                     <strong>
                                         <field name="contact_nbr" class="oe_inline"/> Recipients
                                     </strong>
-                                    <button class="oe_link" type='object' name='action_domain_select' attrs="{'invisible': [('mailing_model', '=', 'mail.mass_mailing.contact')]}">
-                                        <span class="fa fa-arrow-right"> Change Selection</span>
-                                    </button>
                                 </div>
 
                             </div>
                         </group>
                         <notebook>
                             <page string="Mail Body">
-                                <button name="action_edit_html" type="object" string="Design Email" class="oe_highlight"/>
+                                <button name="action_edit_html" type="object" string="Design Email" class="oe_highlight" states="draft"/>
+                                <button name="action_edit_html" type="object" string="Change Email Design" states="test"/>
                                 <div attrs="{'invisible' : ['|', ('body_html','!=',False), ('mailing_domain', '!=', False)]}" class="oe_view_nocontent oe_clear">
                                     <p class="oe_view_nocontent_create oe_edit_only">
                                         Click to design your email.
diff --git a/addons/mass_mailing/wizard/test_mailing.py b/addons/mass_mailing/wizard/test_mailing.py
index 817839459f6..2ecf9bf02ab 100644
--- a/addons/mass_mailing/wizard/test_mailing.py
+++ b/addons/mass_mailing/wizard/test_mailing.py
@@ -6,27 +6,24 @@ from openerp.osv import osv, fields
 
 class TestMassMailing(osv.TransientModel):
     _name = 'mail.mass_mailing.test'
-    _description = 'Tets Mailing Wizard'
-
+    _description = 'Sample Mail Wizard'
     _columns = {
-        'email_to': fields.char(
-            'Emails', required=True,
+        'email_to': fields.char('Recipients', required=True,
             help='Comma-separated list of email addresses.'),
         'mass_mailing_id': fields.many2one('mail.mass_mailing', 'Mailing', required=True),
     }
+    _defaults = {
+        'email_to': lambda self, cr, uid, ctx=None: self.pool['mail.message']._get_default_from(cr, uid, context=ctx),
+    }
 
     def send_mail_test(self, cr, uid, ids, context=None):
         Mail = self.pool['mail.mail']
         for wizard in self.browse(cr, uid, ids, context=context):
             mailing = wizard.mass_mailing_id
-            if not mailing.template_id:
-                raise Warning('Please specify on your mailing the template to use.')
             test_emails = tools.email_split(wizard.email_to)
-            if not test_emails:
-                raise Warning('Please specify test email adresses.')
             mail_ids = []
             for test_mail in test_emails:
-                body = mailing.template_id.body_html
+                body = mailing.body_html
                 unsubscribe_url = self.pool['mail.mass_mailing'].get_unsubscribe_url(cr, uid, mailing.id, 0, email=test_mail, context=context)
                 body = tools.append_content_to_html(body, unsubscribe_url, plaintext=False, container_tag='p')
                 mail_values = {
diff --git a/addons/mass_mailing/wizard/test_mailing.xml b/addons/mass_mailing/wizard/test_mailing.xml
index c59de8d2283..61ea8817bc4 100644
--- a/addons/mass_mailing/wizard/test_mailing.xml
+++ b/addons/mass_mailing/wizard/test_mailing.xml
@@ -6,12 +6,15 @@
             <field name="name">mail.mass_mailing.test.form</field>
             <field name="model">mail.mass_mailing.test</field>
             <field name="arch" type="xml">
-                <form string="Mailing Test" version="7.0">
+                <form string="Send a Sample Mail" version="7.0">
+                    <p class="text-muted">
+                        Send a sample of this mailing to the above of email addresses for test purpose.
+                    </p>
                     <group>
                         <field name="email_to"/>
                     </group>
                     <footer>
-                        <button string="Test Mailing" name="send_mail_test" type="object" class="oe_highlight"/>
+                        <button string="Send Sample Mail" name="send_mail_test" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>

From 2ad0b6e3690c4cdc3e6531ea81bdf120d892b6cf Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Apr 2014 22:29:22 +0200
Subject: [PATCH 09/14] [IMP] removing unused code

bzr revid: fp@tinyerp.com-20140413202922-glv198j62sqeugz2
---
 addons/mass_mailing/models/mass_mailing.py | 48 ++--------------------
 addons/mass_mailing/views/mass_mailing.xml |  5 +--
 2 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py
index 1cfa28cd208..6ba9dd88d76 100644
--- a/addons/mass_mailing/models/mass_mailing.py
+++ b/addons/mass_mailing/models/mass_mailing.py
@@ -245,15 +245,13 @@ class MassMailing(osv.Model):
                 list_ids += command[2]
         if list_ids:
             values['contact_nbr'] = self.pool[mailing_model].search(
-                cr, uid,
-                self.pool['mail.mass_mailing.list'].get_global_domain(cr, uid, list_ids, context=context)[mailing_model],
+                cr, uid, [('list_id', 'in', list_ids), ('opt_out','!=',1)],
                 count=True, context=context
             )
+        else:
+            values['contact_nbr'] = 0
         return {'value': values}
 
-    def on_change_contact_ab_pc(self, cr, uid, ids, contact_ab_pc, contact_nbr, context=None):
-        return {'value': {'contact_ab_nbr': contact_nbr * contact_ab_pc / 100.0}}
-
     def action_duplicate(self, cr, uid, ids, context=None):
         copy_id = None
         for mid in ids:
@@ -269,44 +267,6 @@ class MassMailing(osv.Model):
             }
         return False
 
-    def _get_model_to_list_action_id(self, cr, uid, model, context=None):
-        if model == 'res.partner':
-            return self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, 'mass_mailing.action_partner_to_mailing_list')
-        else:
-            return self.pool['ir.model.data'].xmlid_to_res_id(cr, uid, 'mass_mailing.action_contact_to_mailing_list')
-
-    def action_domain_select(self, cr, uid, ids, context=None):
-        mailing = self.browse(cr, uid, ids[0], context=context)
-        ctx = dict(
-            context,
-            search_default_not_opt_out=True,
-            view_manager_highlight=[action_id],         # To Change
-            default_mass_mailing_id=ids[0],
-            default_model=mailing.mailing_model
-        )
-        return {
-            'name': _('Choose Recipients'),
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': mailing.mailing_model,
-            'context': ctx,
-        }
-
-    def action_see_recipients(self, cr, uid, ids, context=None):
-        mailing = self.browse(cr, uid, ids[0], context=context)
-        domain = self.pool['mail.mass_mailing.list'].get_global_domain(cr, uid, [c.id for c in mailing.contact_list_ids], context=context)[mailing.mailing_model]
-        return {
-            'name': _('See Recipients'),
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'res_model': mailing.mailing_model,
-            'target': 'new',
-            'domain': domain,
-            'context': context,
-        }
-
     def action_test_mailing(self, cr, uid, ids, context=None):
         ctx = dict(context, default_mass_mailing_id=ids[0])
         return {
@@ -349,7 +309,7 @@ class MassMailing(osv.Model):
         res_ids = self.pool[mailing.mailing_model].search(cr, uid, domain, context=context)
 
         # randomly choose a fragment
-        if mailing.contact_ab_pc != 100:
+        if mailing.contact_ab_pc < 100:
             topick = mailing.contact_ab_nbr
             if mailing.mass_mailing_campaign_id and mailing.ab_testing:
                 already_mailed = self.pool['mail.mass_mailing.campaign'].get_recipients(cr, uid, [mailing.mass_mailing_campaign_id.id], context=context)[mailing.mass_mailing_campaign_id.id]
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 3a4e47b405c..e4aed49280e 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -194,8 +194,7 @@
                         </strong></p>
                     </div>
                     <sheet>
-
-                        <div class="oe_button_box pull-right" attrs="{'invisible': [('total', '=', 0)]}">
+                        <div class="oe_button_box pull-right" attrs="{'invisible': [('state', 'in', ('draft','test'))]}">
                             <button name="%(action_mail_mass_mailing_report)d"
                                 type="action" class="oe_stat_button">
                                 <field name="received_ratio" string="Received" widget="percentpie"/>
@@ -209,7 +208,7 @@
                                 <field name="replied_ratio" string="Replied" widget="percentpie"/>
                             </button>
                         </div>
-                        <div class="oe_button_box" attrs="{'invisible': [('total', '=', 0)]}" style="margin-bottom: 32px">
+                        <div class="oe_button_box" attrs="{'invisible': [('state', 'in', ('draft','test'))]}" style="margin-bottom: 32px">
                             <button name="%(action_mail_mass_mailing_report)d" type="action"
                                 icon="fa-envelope-o" class="oe_stat_button">
                                 <field name="total" string="Emails" widget="statinfo"/>

From 96a750fd03c475cedff0f9053d5710a2aa34473d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Apr 2014 22:33:09 +0200
Subject: [PATCH 10/14] [IMP] Removing featuer

bzr revid: fp@tinyerp.com-20140413203309-digp60hsobgv3i57
---
 .../mass_mailing/data/mass_mailing_demo.xml   |  1 -
 addons/mass_mailing/models/__init__.py        |  1 -
 addons/mass_mailing/models/email_template.py  | 36 -------------------
 addons/mass_mailing/views/email_template.xml  | 32 +----------------
 4 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 addons/mass_mailing/models/email_template.py

diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index d6fc5167e45..b35608e6fbc 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -14,7 +14,6 @@
             <field name="auto_delete" eval="False"/>
             <field name="partner_to">${object.id}</field>
             <field name="reply_to"><![CDATA[Info <info@yourcompany.example.com>]]></field>
-            <field name="use_in_mass_mailing" eval="True"/>
             <field name="use_default_to" eval="True"/>
             <field name="attachment_ids" eval="[(4, ref('mass_mail_attach_1'))]"/>
             <field name="body_html"><![CDATA[<div data-snippet-id="big-picture" style="padding:0px; margin:0px">
diff --git a/addons/mass_mailing/models/__init__.py b/addons/mass_mailing/models/__init__.py
index f1809e54a4f..702da268d84 100644
--- a/addons/mass_mailing/models/__init__.py
+++ b/addons/mass_mailing/models/__init__.py
@@ -4,6 +4,5 @@ import mass_mailing
 import mass_mailing_stats
 import mail_mail
 import mail_thread
-import email_template
 import res_config
 import mass_mailing_report
diff --git a/addons/mass_mailing/models/email_template.py b/addons/mass_mailing/models/email_template.py
deleted file mode 100644
index 8b145ba0069..00000000000
--- a/addons/mass_mailing/models/email_template.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from openerp.tools.translate import _
-from openerp.osv import osv, fields
-
-
-class EmailTemplate(osv.Model):
-    """Add the mass mailing campaign data to mail"""
-    _name = 'email.template'
-    _inherit = ['email.template']
-    _columns = {
-        'use_in_mass_mailing': fields.boolean('Available for marketing and mailing'),
-    }
-    def action_new_mailing(self, cr, uid, ids, context=None):
-        template = self.browse(cr, uid, ids[0], context=context)
-        ctx = dict(context)
-        ctx.update({
-            'default_mailing_model': template.model,
-            'default_template_id': ids[0],
-        })
-        return {
-            'name': _('Create a Mass Mailing'),
-            'type': 'ir.actions.act_window',
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'mail.mass_mailing',
-            'views': [(False, 'form')],
-            'context': ctx,
-        }
-
-
-class email_template_preview(osv.TransientModel):
-    """ Reinitialize email template preview model to have access to all email.template
-    new fields. """
-    _name = "email_template.preview"
-    _inherit = ['email.template', 'email_template.preview']
diff --git a/addons/mass_mailing/views/email_template.xml b/addons/mass_mailing/views/email_template.xml
index 438852609bb..a1bc87a8de0 100644
--- a/addons/mass_mailing/views/email_template.xml
+++ b/addons/mass_mailing/views/email_template.xml
@@ -3,17 +3,6 @@
     <data>
 
         <!-- Email Templates -->
-        <record id="email_template_form_mass_mailing" model="ir.ui.view">
-            <field name="name">email.template.form.mass.mailing</field>
-            <field name="model">email.template</field>
-            <field name="inherit_id" ref="email_template.email_template_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='model_id']" position="after">
-                        <field name="use_in_mass_mailing"/>
-                </xpath>
-            </field>
-        </record>
-
         <record model="ir.ui.view" id="email_template_form_minimal">
             <field name="name">email.template.form.minimal</field>
             <field name="model">email.template</field>
@@ -29,7 +18,6 @@
                                     domain="[('model', 'in', ['res.partner', 'mail.mass_mailing.contact'])]"/>
                                 <field name="model" invisible="True"/>
                                 <field name="use_default_to" invisible="1"/>
-                                <field name="use_in_mass_mailing" invisible="1"/>
                             </group>
                             <group>
                                 <div class="oe_right oe_button_box" name="buttons">
@@ -53,19 +41,6 @@
             </field>
         </record>
 
-        <record id="view_email_template_search_mass_mailing" model="ir.ui.view">
-           <field name="name">email.template.search.mass.mailing</field>
-           <field name="model">email.template</field>
-           <field name="inherit_id" ref="email_template.view_email_template_search"/>
-           <field name="arch" type="xml">
-                <xpath expr="//field[@name='model_id']" position="after">
-                    <separator/>
-                    <filter string="Available for Marketing and Mailing" name="use_in_mass_mailing" domain="[('use_in_mass_mailing', '=', 1)]"
-                        help="Available for use in mass mailings"/>
-                </xpath>
-           </field>
-        </record>
-
         <record model="ir.ui.view" id="view_email_template_kanban">
             <field name="name">email.template.kanban</field>
             <field name="model">email.template</field>
@@ -78,9 +53,6 @@
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
-                                        <t>
-                                            <li><a name="action_new_mailing" type="object">New Mailing</a></li>
-                                        </t>
                                         <t t-if="widget.view.is_action_enabled('edit')">
                                             <li><a type="edit">Edit</a></li>
                                         </t>
@@ -110,11 +82,9 @@
             <field name="res_model">email.template</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
-            <field name="domain" eval="[('use_in_mass_mailing', '=', True)]"/>
             <field name="context">{
     'form_view_ref': 'mass_mailing.email_template_form_minimal',
     'default_use_default_to': True,
-    'default_use_in_mass_mailing': True,
 }</field>
         </record>
 
@@ -124,4 +94,4 @@
             action="action_email_template_marketing"/>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

From 57078f5c1280e9be452c2365a76c378f95d3a55f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Apr 2014 22:36:34 +0200
Subject: [PATCH 11/14] [IMP] features

bzr revid: fp@tinyerp.com-20140413203634-75mf4z8o3xh7i83h
---
 addons/mass_mailing/views/mass_mailing.xml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index e4aed49280e..bbf5760c6e4 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -436,13 +436,31 @@
             </field>
         </record>
 
+        <record id="action_new_mass_mailing" model="ir.actions.act_window">
+            <field name="name">Mass Mailings</field>
+            <field name="res_model">mail.mass_mailing</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,kanban,tree</field>
+            <field name="context">{'campaign_id': active_id}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to create a new mailing.
+                </p><p>
+                    Mass mailing allows you to to easily design and send mass
+                    mailings to your contacts, customers or leads using mailing
+                    lists.
+                </p>
+            </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_new_mailing" type="object" class="oe_highlight" string="New Mailing"/>
+                        <button name="%(action_new_mass_mailing)d" type="action" class="oe_highlight" string="New Mailing"/>
                         <field name="stage_id" widget="statusbar" clickable="True"/>
                     </header>
                     <sheet>

From 3db31606442900cc6783076d008b49f1965fb5e4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Apr 2014 22:46:25 +0200
Subject: [PATCH 12/14] [IMP] website_link field removed

bzr revid: fp@tinyerp.com-20140413204625-tu2bw7cyj14rjx53
---
 addons/website_mail/models/email_template.py  | 20 +++++++++----------
 .../views/email_template_view.xml             |  4 +---
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/addons/website_mail/models/email_template.py b/addons/website_mail/models/email_template.py
index 64beacea835..2cd6a7adf8f 100644
--- a/addons/website_mail/models/email_template.py
+++ b/addons/website_mail/models/email_template.py
@@ -25,14 +25,12 @@ from openerp.tools.translate import _
 
 class EmailTemplate(osv.Model):
     _inherit = 'email.template'
-
-    def _get_website_link(self, cr, uid, ids, name, args, context=None):
-        return dict((id, _('<a href="website_mail/email_designer?model=email.template&res_id=%d">Open with visual editor</a>') % id) for id in ids)
-
-    _columns = {
-        'website_link': fields.function(
-            _get_website_link, type='text',
-            string='Website Link',
-            help='Link to the website',
-        ),
-    }
+    def action_edit_html(self, cr, uid, ids, name, args, context=None):
+        assert len(ids)==1, "One and only one ID allowed for this action"
+        url = '/website_mail/email_designer?model=email.template&res_id=%d&field_body=body_html&field_from=email_form&field_subject=name' % (ids[0],)
+        return {
+            'name': _('Edit Template'),
+            'type': 'ir.actions.act_url',
+            'url': url,
+            'target': 'self',
+        }
diff --git a/addons/website_mail/views/email_template_view.xml b/addons/website_mail/views/email_template_view.xml
index 295002a98e7..522730ed337 100644
--- a/addons/website_mail/views/email_template_view.xml
+++ b/addons/website_mail/views/email_template_view.xml
@@ -7,9 +7,7 @@
             <field name="inherit_id" ref="email_template.email_template_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//h1" position="after">
-                    <br />
-                    <field name="website_link" widget='html' radonly='1'
-                        style='margin: 0px; padding: 0px;'/>
+                    <button string="Edit Template" name="action_edit_html" type="object"/>
                 </xpath>
             </field>
         </record>

From 8d42202c92144f3b8eeecee78219926c6a4d1d93 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 13 Apr 2014 22:53:37 +0200
Subject: [PATCH 13/14] [FIX] show stages only if campaign is set

bzr revid: fp@tinyerp.com-20140413205337-kkr9xtk6x5bzvzo5
---
 addons/mass_mailing/views/mass_mailing.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index bbf5760c6e4..3d5aa1efb00 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -401,6 +401,7 @@
 
         <menuitem name="Campaign Stages" id="menu_view_mass_mailing_stages"
             parent="marketing_configuration" sequence="1"
+            groups="mass_mailing.group_mass_mailing_campaign"
             action="action_view_mass_mailing_stages"/>
 
         <!--  MASS MAILING CAMPAIGNS !-->

From 34e618965a486e6a64a258a9cd0c85ca7dd99a79 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 14 Apr 2014 10:10:35 +0200
Subject: [PATCH 14/14] [IMP] commment

bzr revid: fp@tinyerp.com-20140414081035-9ixrag5oly2q0emb
---
 addons/mass_mailing/static/src/js/mass_mailing.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
index 7a52b785714..5936d3aabbf 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -1,7 +1,5 @@
 openerp.mass_mailing = function (instance) {
     var _t = instance.web._t;
-	debugger;
-
     openerp.mass_mailing = function(openerp) {
         openerp.web_kanban.KanbanRecord.include({
             on_card_clicked: function (event) {
@@ -50,6 +48,7 @@ openerp.mass_mailing = function (instance) {
                     contexts: search_data.contexts,
                     group_by_seq: search_data.groupbys || []
                 }).then(function (results) {
+                    // if selected IDS change domain
                     var domain = self2.pop.dataset.domain.concat(results.domain || []);
                     self.set_value(JSON.stringify(domain))
                 });