From b0bed63351956455a23cdc960292e104af53f67a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 23 Aug 2011 19:58:09 +0200
Subject: [IMP] mail.thread: renaming methods to avoid collisions with objects
 that use the mixin

bzr revid: odo@openerp.com-20110823175809-hw81fkptg90702vh
---
 addons/mail/mail_message_view.xml | 154 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 addons/mail/mail_message_view.xml

(limited to 'addons/mail/mail_message_view.xml')

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
new file mode 100644
index 00000000000..eb4fc641896
--- /dev/null
+++ b/addons/mail/mail_message_view.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <menuitem name="Configuration" parent="base.menu_tools" id="base.menu_lunch_survey_root" sequence="20"/>
+
+        <record model="ir.ui.view" id="view_email_message_form">
+            <field name="name">mail.message.form</field>
+            <field name="model">mail.message</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Email message">
+                    <group colspan="4" col="6">
+                       <field name="subject" colspan="4"/>
+                       <field name="date"/>
+                       <field name="user_id" string="User"/>
+                       <field name="partner_id" readonly="1" attrs="{'invisible':[('partner_id', '=', False)]}"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Details">
+                            <group col="2" colspan="2">
+                                <separator string="Recipients" colspan="4"/>
+                                <field name="email_from"/>
+                                <field name="email_to"/>
+                                <field name="email_cc" attrs="{'invisible':[('email_cc', '=', False)]}"/>
+                                <field name="email_bcc" groups="base.group_extended" attrs="{'invisible':[('email_bcc', '=', False)]}"/>
+                                <field name="reply_to" attrs="{'invisible':[('reply_to', '=', False)]}"/>
+                            </group>
+                            <group col="4" colspan="2">
+                                <separator string="Message Details" colspan="4"/>
+                                <field name="model"/>
+                                <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"/>
+                                <field name="res_id" groups="base.group_extended"/>
+                                <field name="message_id" groups="base.group_extended" colspan="4" attrs="{'invisible':[('message_id', '=', False)]}"/>
+                                <field name="references" colspan="4" widget="char" size="512" groups="base.group_extended" attrs="{'invisible':[('references', '=', False)]}"/>
+                            </group>
+
+                            <notebook colspan="4">
+                                <page string="Body (Plain)" attrs="{'invisible':[('subtype','=','html')]}">
+                                    <field name="body_text" colspan="4" widget="text" nolabel="1"/>
+                                </page>
+                                <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
+                                    <field name="body_html" widget="text_html" nolabel="1" colspan="4"/>
+                                </page>
+                            </notebook>
+
+                            <separator string="" colspan="4"/>
+                            <group col="6" colspan="4">
+                                <field name="state" colspan="2"/>
+                                <group col="4" colspan="2">
+                                    <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
+                                    context="{'mail':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
+                                    <button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
+                                    <button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/>
+                                    <button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Attachments">
+                            <separator string="Attachments" colspan="4"/>
+                            <field name="attachment_ids" nolabel="1" colspan="4"/>
+                        </page>
+                        <page string="Advanced" groups="base.group_extended">
+                            <group col="2" colspan="4">
+                                <field name="mail_server_id" attrs="{'invisible':[('mail_server_id', '=', False)]}"/>
+                                <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
+                                <field name="auto_delete"/>
+                                <field name="headers" colspan="4" attrs="{'invisible':[('headers', '=', False)]}"/>
+                                <field name="original" colspan="4" height="350" attrs="{'invisible':[('original', '=', False)]}"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_email_message_tree">
+            <field name="name">mail.message.tree</field>
+            <field name="model">mail.message</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Emails" colors="grey:state in ('sent', 'cancel');blue:state=='outgoing';red:state=='exception';black:state=='received'">
+                    <field name="date"/>
+                    <field name="subject"/>
+                    <field name="email_from"/>
+                    <field name="user_id" string="User"/>
+                    <field name="message_id" invisible="1"/>
+                    <field name="partner_id" invisible="1"/>
+                    <field name="state"/>
+                    <button name="open_document" string="Open Related Document" type="object" icon="gtk-jump-to"/>
+                    <button name="open_attachment" string="Open Attachments" type="object" icon="gtk-jump-to"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_email_message_search">
+            <field name="name">mail.message.search</field>
+            <field name="model">mail.message</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Email Search">
+                    <filter icon="terp-camera_test" string="Received" domain="[('state','=','received')]"/>
+                    <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
+                    <filter icon="terp-gtk-stop" string="Exception" domain="[('state','=','exception')]"/>
+                    <field name="email_from"/>
+                    <field name="email_to"/>
+                    <field name="subject"/>
+                    <field name="date"/>
+                    <newline/>
+                    <group expand="0" string="Extended Filters..." groups="base.group_extended">
+                    <field name="user_id" string="User"/>
+                    <field name="partner_id" string="Partner Name"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." groups="base.group_extended">
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_view_mail_message" model="ir.actions.act_window">
+            <field name="name">Messages</field>
+            <field name="res_model">mail.message</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('email_from', '!=', False)]</field>
+             <field name="context">{'search_default_outgoing':1}</field>
+            <field name="search_view_id" ref="view_email_message_search"/>
+        </record>
+
+        <act_window domain="[('partner_id', '=', active_id), ('email_from', '!=', False)]"
+            id="act_res_partner_emails" name="Emails"
+            res_model="mail.message"
+            src_model="res.partner"
+            view_id="view_email_message_tree"/>
+
+        <menuitem name="Emails" id="menu_email_message_tools" parent="base.menu_tools" />
+
+        <menuitem name="Messages"
+            id="menu_email_message"
+            parent="menu_email_message_tools"
+            action="action_view_mail_message" />
+
+        <menuitem name="Emails" id="menu_config_email" parent="base.menu_lunch_survey_root" sequence="20"/>
+
+    </data>
+</openerp>
-- 
cgit v1.2.3


From e9d94b824eee6970bf3263d7d0fd3208a3b0f037 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 6 Sep 2011 10:00:14 +0200
Subject: [IMP]: crm,mail: minor fixes after review

bzr revid: odo@openerp.com-20110906080014-6texz097jepfrwsp
---
 addons/mail/mail_message_view.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/mail/mail_message_view.xml')

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index eb4fc641896..1e868e6dec6 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -87,6 +87,7 @@
                     <field name="message_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="state"/>
+                    <button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
                     <button name="open_document" string="Open Related Document" type="object" icon="gtk-jump-to"/>
                     <button name="open_attachment" string="Open Attachments" type="object" icon="gtk-jump-to"/>
                 </tree>
-- 
cgit v1.2.3


From 1db8e54425bd72477d67e77c62a160b405370f09 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 6 Sep 2011 11:32:28 +0200
Subject: [IMP] all: unified context params for mail composition wizard

A single common `mail.compose.message.mode` key is now
used in the context, avoiding name collisions and being
more consistent.

bzr revid: odo@openerp.com-20110906093228-itbilwzpv4wl07j9
---
 addons/mail/mail_message_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/mail_message_view.xml')

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 1e868e6dec6..0447590c134 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -49,7 +49,7 @@
                                 <field name="state" colspan="2"/>
                                 <group col="4" colspan="2">
                                     <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
-                                    context="{'mail':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
+                                    context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
                                     <button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
                                     <button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/>
                                     <button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/>
-- 
cgit v1.2.3


From 2d87c2b12ec3557ee2cb25b97b0bf963bc3fa211 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 6 Sep 2011 18:52:04 +0200
Subject: =?UTF-8?q?[IMP]=20mail:=20usability=20-=20better=20labels=C2=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bzr revid: odo@openerp.com-20110906165204-sovbbbmvqrpttg7e
---
 addons/mail/mail_message_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/mail_message_view.xml')

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 0447590c134..c3ceb0740fa 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -102,7 +102,7 @@
                 <search string="Email Search">
                     <filter icon="terp-camera_test" string="Received" domain="[('state','=','received')]"/>
                     <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
-                    <filter icon="terp-gtk-stop" string="Exception" domain="[('state','=','exception')]"/>
+                    <filter icon="terp-gtk-stop" string="Failed" domain="[('state','=','exception')]"/>
                     <field name="email_from"/>
                     <field name="email_to"/>
                     <field name="subject"/>
-- 
cgit v1.2.3


From 7c7c8a0348f2dd4eb8b701d2b709b3215c2b18bb Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 7 Sep 2011 17:13:48 +0200
Subject: [IMP] mail*: mail.message.original: binary field and optional

bzr revid: odo@openerp.com-20110907151348-jiqfqm5cagy8bzto
---
 addons/mail/mail_message_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/mail/mail_message_view.xml')

diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index c3ceb0740fa..83e7474fe1a 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -36,12 +36,12 @@
                             </group>
 
                             <notebook colspan="4">
-                                <page string="Body (Plain)" attrs="{'invisible':[('subtype','=','html')]}">
-                                    <field name="body_text" colspan="4" widget="text" nolabel="1"/>
-                                </page>
                                 <page string="Body (Rich)" attrs="{'invisible':[('subtype','=','plain')]}">
                                     <field name="body_html" widget="text_html" nolabel="1" colspan="4"/>
                                 </page>
+                                <page string="Body (Plain)">
+                                    <field name="body_text" colspan="4" widget="text" nolabel="1"/>
+                                </page>
                             </notebook>
 
                             <separator string="" colspan="4"/>
@@ -66,7 +66,7 @@
                                 <field name="subtype" attrs="{'invisible':[('subtype', '=', False)]}"/>
                                 <field name="auto_delete"/>
                                 <field name="headers" colspan="4" attrs="{'invisible':[('headers', '=', False)]}"/>
-                                <field name="original" colspan="4" height="350" attrs="{'invisible':[('original', '=', False)]}"/>
+                                <field name="original" colspan="4" attrs="{'invisible':[('original', '=', False)]}"/>
                             </group>
                         </page>
                     </notebook>
-- 
cgit v1.2.3