From 1ac8e7cdfddbf8ac6b7c4b843582392705f10a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 20 Feb 2014 16:29:45 +0100
Subject: [IMP] mail, email_template: mass mailing feature cleaning - now
 differentiates mass mailing and mass post. - mass mailing is a true mass
 mailing - using same_thread log a copy in the document, without using
 message_post (using notification field, + model and res_id) - improved form
 view of composer, adding a filed explaining a bit the various recipients -
 removed unnecessary fields coming from the template (partner_to, ...) because
 they are confusing -> composer should be easier to understand and use -
 removed some unnecessary code - removed double body computation when using
 templates (one for tmeplate, then the wizard -> not necessary)

This commit will be followed by other to try to improve the mass mailing
and mass post.

bzr revid: tde@openerp.com-20140220152945-ash0hfkzevzamihq
---
 addons/mail/wizard/mail_compose_message_view.xml | 42 ++++++++++++++----------
 1 file changed, 24 insertions(+), 18 deletions(-)

(limited to 'addons/mail/wizard/mail_compose_message_view.xml')

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 948d9b3832c..4c539e426d9 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -28,29 +28,35 @@
                         <field name="email_from"
                             attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
                         <field name="subject" placeholder="Subject..." required="True"/>
-                        <!-- classic message composer -->
-                        <label for="partner_ids" string="Recipients"
-                            attrs="{'invisible':[('composition_mode', '=', 'mass_mail')]}"/>
-                        <div groups="base.group_user"
-                            attrs="{'invisible':[('composition_mode', '=', 'mass_mail')]}">
-                            <span attrs="{'invisible':[('model', '=', False)]}">
-                                Followers of
-                                <field name="record_name" readonly="1" class="oe_inline oe_compose_recipients"/>
-                                and
+                        <!-- recipients -->
+                        <label for="partner_ids" string="Recipients" groups="base.group_user"/>
+                        <div groups="base.group_user">
+                            <span attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')]}">
+                                <strong>Email mass mailing</strong> on
+                                <span attrs="{'invisible': [('use_active_domain', '=', True)]}">the selected records</span>
+                                <span attrs="{'invisible': [('use_active_domain', '=', False)]}">the current search filter</span>.
+                                <br />
+                                <span>The following contacts will be mailed: </span>
                             </span>
+                            <field name="recipients_data" class="oe_inline oe_compose_recipients" readonly="1"/>
+                            <span attrs="{'invisible':['|', ('composition_mode', '!=', 'comment'), ('recipients_data', '=', False)]}">and</span>
                             <field name="partner_ids" widget="many2many_tags_email" placeholder="Add contacts to notify..."
-                                context="{'force_email':True, 'show_email':True}"/>
+                                context="{'force_email':True, 'show_email':True}"
+                                attrs="{'invisible': [('composition_mode', '!=', 'comment')]}"/>
                         </div>
-                        <!-- mass post / mass mailing -->
-                        <field name="post"
-                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
+                        <!-- mass post -->
                         <field name="notify"
-                            attrs="{'invisible':['|', ('post', '!=', True), ('composition_mode', '!=', 'mass_mail')]}"/>
-                        <field name="same_thread"
-                            attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
-                        <field name="reply_to" placeholder="Email address te redirect replies..."
+                            attrs="{'invisible':['|', ('composition_mode', '!=', 'mass_post')]}"/>
+                        <!-- mass mailing -->
+                        <label for="same_thread"/>
+                            <div>
+                                <field name="same_thread"
+                                    attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
+                                (a copy of the message will be added in the Chatter of each document)
+                            </div>
+                        <field name="reply_to" placeholder="Email address to redirect replies..."
                             attrs="{'invisible':['|', ('same_thread', '=', True), ('composition_mode', '!=', 'mass_mail')],
-                                    'required':[('same_thread', '!=', True)]}"/>
+                                    'required':[('same_thread', '!=', True), ('composition_mode', '=', 'mass_mail')]}"/>
                     </group>
                     <field name="body"/>
                     <field name="attachment_ids" widget="many2many_binary" string="Attach a file"/>
-- 
cgit v1.2.3


From d5a8905941f6af1245721d985e2a01f76d170a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 17 Mar 2014 13:24:09 +0100
Subject: [IMP] mail_compose_message: added is_log boolean field for internal
 notes; + removed context hack that did the same thing. Fixed composer form
 view: internal note, only subject + body is displayed.

bzr revid: tde@openerp.com-20140317122409-5fd5d5uwc35oq0hb
---
 addons/mail/wizard/mail_compose_message_view.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'addons/mail/wizard/mail_compose_message_view.xml')

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 4c539e426d9..a2f723db99d 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -11,6 +11,7 @@
                         <field name="composition_mode" invisible="1"/>
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
+                        <field name="is_log" invisible="1"/>
                         <field name="parent_id" invisible="1"/>
                         <field name="mail_server_id" invisible="1"/>
                         <!-- Various warnings -->
@@ -29,8 +30,8 @@
                             attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
                         <field name="subject" placeholder="Subject..." required="True"/>
                         <!-- recipients -->
-                        <label for="partner_ids" string="Recipients" groups="base.group_user"/>
-                        <div groups="base.group_user">
+                        <label for="partner_ids" string="Recipients"  attrs="{'invisible': [('is_log', '=', True)]}" groups="base.group_user"/>
+                        <div groups="base.group_user" attrs="{'invisible': [('is_log', '=', True)]}">
                             <span attrs="{'invisible': [('composition_mode', '!=', 'mass_mail')]}">
                                 <strong>Email mass mailing</strong> on
                                 <span attrs="{'invisible': [('use_active_domain', '=', True)]}">the selected records</span>
@@ -48,12 +49,7 @@
                         <field name="notify"
                             attrs="{'invisible':['|', ('composition_mode', '!=', 'mass_post')]}"/>
                         <!-- mass mailing -->
-                        <label for="same_thread"/>
-                            <div>
-                                <field name="same_thread"
-                                    attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
-                                (a copy of the message will be added in the Chatter of each document)
-                            </div>
+                        <field name="same_thread" attrs="{'invisible':[('composition_mode', '!=', 'mass_mail')]}"/>
                         <field name="reply_to" placeholder="Email address to redirect replies..."
                             attrs="{'invisible':['|', ('same_thread', '=', True), ('composition_mode', '!=', 'mass_mail')],
                                     'required':[('same_thread', '!=', True), ('composition_mode', '=', 'mass_mail')]}"/>
-- 
cgit v1.2.3


From 86934c116736dcec9249e64d8fa7ff6a735a3b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 17 Mar 2014 14:22:43 +0100
Subject: [FIX] mail_compose_message: hide recipients data if False to avoid
 blank lines

bzr revid: tde@openerp.com-20140317132243-7cy089m8thd29y3l
---
 addons/mail/wizard/mail_compose_message_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/wizard/mail_compose_message_view.xml')

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index a2f723db99d..4bab178ac53 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -39,7 +39,7 @@
                                 <br />
                                 <span>The following contacts will be mailed: </span>
                             </span>
-                            <field name="recipients_data" class="oe_inline oe_compose_recipients" readonly="1"/>
+                            <field name="recipients_data" class="oe_inline oe_compose_recipients" readonly="1" attrs="{'invisible':[('recipients_data', '=', False)]}"/>
                             <span attrs="{'invisible':['|', ('composition_mode', '!=', 'comment'), ('recipients_data', '=', False)]}">and</span>
                             <field name="partner_ids" widget="many2many_tags_email" placeholder="Add contacts to notify..."
                                 context="{'force_email':True, 'show_email':True}"
-- 
cgit v1.2.3


From 55fc583f36b4764592d196e2f5d3c7b8ded50077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 Apr 2014 16:33:43 +0200
Subject: [REM] mail: compose message: removed unnecessary code

bzr revid: tde@openerp.com-20140415143343-on2d3j92o6zifq59
---
 addons/mail/wizard/mail_compose_message_view.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'addons/mail/wizard/mail_compose_message_view.xml')

diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 4bab178ac53..5b6bfc50439 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -36,11 +36,8 @@
                                 <strong>Email mass mailing</strong> on
                                 <span attrs="{'invisible': [('use_active_domain', '=', True)]}">the selected records</span>
                                 <span attrs="{'invisible': [('use_active_domain', '=', False)]}">the current search filter</span>.
-                                <br />
-                                <span>The following contacts will be mailed: </span>
                             </span>
-                            <field name="recipients_data" class="oe_inline oe_compose_recipients" readonly="1" attrs="{'invisible':[('recipients_data', '=', False)]}"/>
-                            <span attrs="{'invisible':['|', ('composition_mode', '!=', 'comment'), ('recipients_data', '=', False)]}">and</span>
+                            <span attrs="{'invisible':[('composition_mode', '!=', 'comment')]}">Followers of the document and</span>
                             <field name="partner_ids" widget="many2many_tags_email" placeholder="Add contacts to notify..."
                                 context="{'force_email':True, 'show_email':True}"
                                 attrs="{'invisible': [('composition_mode', '!=', 'comment')]}"/>
-- 
cgit v1.2.3