From 1a2735c7b2407470418b6dbf8c994b86ded24c53 Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 16:47:32 +0530
Subject: [IMP] mail: remove cancel button and improved view of wizard.

bzr revid: tpa@tinyerp.com-20120615111732-pzquodtezhyfpakp
---
 addons/mail/wizard/mail_compose_message_view.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 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 d559d679c8b..da782ae16ab 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -6,7 +6,10 @@
             <field name="model">mail.compose.message</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Compose Email">
+                <form string="Compose Email" version="7.0">
+                    <header>
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_form_button_active_flow"/>
+                    </header>
                     <group col="6" colspan="4">
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
@@ -28,11 +31,6 @@
                             <field name="attachment_ids" colspan="4" nolabel="1"/>
                         </page>
                     </notebook>
-                    <group col="4" colspan="4">
-                        <label string="" name="placeholder" colspan="1"/>
-                        <button icon="gtk-close" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" name="send_mail" string="Send" type="object"/>
-                    </group>
                 </form>
             </field>
         </record>
-- 
cgit v1.2.3


From 660cc67256df5caeffd208c3c1a5efabcb637a05 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Wed, 20 Jun 2012 16:19:23 +0530
Subject: [IMP]Added highlight button on wizard

bzr revid: tch@tinyerp.com-20120620104923-z1hty740vn160fg9
---
 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 da782ae16ab..47f5f6509b1 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_highlight"/>
                     </header>
                     <group col="6" colspan="4">
                         <field name="model" invisible="1"/>
-- 
cgit v1.2.3


From 0e97cefe9e8247cac86a1c8342fb4f21ff8cb016 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Mon, 25 Jun 2012 15:39:01 +0530
Subject: [IMP]Improve wizard button

bzr revid: tch@tinyerp.com-20120625100901-ucjbttxod55erqmf
---
 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 47f5f6509b1..b6780d160f6 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_highlight"/>
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_highlight_editable" />
                     </header>
                     <group col="6" colspan="4">
                         <field name="model" invisible="1"/>
-- 
cgit v1.2.3


From 471037495c7572c0b1aac2b069a67a7c0e1f56f5 Mon Sep 17 00:00:00 2001
From: "Twinkle (OpenERP)" <tch@tinyerp.com>
Date: Tue, 26 Jun 2012 12:01:19 +0530
Subject: [IMP]Apply css class flow on wizards buttons

bzr revid: tch@tinyerp.com-20120626063119-5i93di16milljxap
---
 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 b6780d160f6..bc7ddf244c9 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_highlight_editable" />
+                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_highlight_on_dirty"  />
                     </header>
                     <group col="6" colspan="4">
                         <field name="model" invisible="1"/>
-- 
cgit v1.2.3


From a4b94dbee6fe6ec1dd7aaa5f66186a2842d6a101 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 27 Jun 2012 19:49:17 +0530
Subject: [USA] add cancel button

bzr revid: rma@tinyerp.com-20120627141917-bs9bg2j3dasy9n1y
---
 addons/mail/wizard/mail_compose_message_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 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 bc7ddf244c9..19df1dba860 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -8,7 +8,9 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
                     <header>
-                        <button icon="gtk-ok" name="send_mail" string="Send" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="send_mail" string="Send" type="object" class="oe_highlight_on_dirty"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="6" colspan="4">
                         <field name="model" invisible="1"/>
-- 
cgit v1.2.3


From 1702b2335d7febda80f38846cec386053c0e41a0 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 28 Jun 2012 12:10:05 +0530
Subject: [IMP]remove tabs and add spaces instead of them

bzr revid: sgo@tinyerp.com-20120628064005-zuerrpazumf5lf1q
---
 addons/mail/wizard/mail_compose_message_view.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 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 d559d679c8b..a5daaec12af 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data>
+    <data>
         <record model="ir.ui.view" id="email_compose_message_wizard_form">
             <field name="name">mail.compose.message.form</field>
             <field name="model">mail.compose.message</field>
@@ -47,14 +47,14 @@
             <field name="target">new</field>
         </record>
 
-	    <!--  Replace the default mass-mailing wizard in base with the composition wizard -->
-	    <act_window name="Mass Mailing"
-	            res_model="mail.compose.message"
-	            src_model="res.partner"
-	            view_mode="form"
-	            target="new"
-	            key2="client_action_multi"
-	            id="base.action_partner_mass_mail"
-	            context="{'mail.compose.message.mode':'mass_mail'}"/>
-	</data>
+        <!--  Replace the default mass-mailing wizard in base with the composition wizard -->
+        <act_window name="Mass Mailing"
+                res_model="mail.compose.message"
+                src_model="res.partner"
+                view_mode="form"
+                target="new"
+                key2="client_action_multi"
+                id="base.action_partner_mass_mail"
+                context="{'mail.compose.message.mode':'mass_mail'}"/>
+    </data>
 </openerp>
-- 
cgit v1.2.3


From 5133bee1d529722cd690188d61d51debd2d91968 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 10:30:24 +0200
Subject: [FIX] in form views, replace class 'oe_highlight_on_dirty' by
 'oe_highlight'

bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
---
 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 19df1dba860..33c4911eec6 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
                     <header>
-                        <button name="send_mail" string="Send" type="object" class="oe_highlight_on_dirty"  />
+                        <button name="send_mail" string="Send" type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-- 
cgit v1.2.3


From 2da3bd696332aa5dbce223d32d587a4d929e92e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 2 Jul 2012 10:46:32 +0200
Subject: [IMP] mail.compose.message wizard: cleaned form view.

bzr revid: tde@openerp.com-20120702084632-4r7pi6eb0sh9cgxs
---
 addons/mail/wizard/mail_compose_message_view.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 99eb7192738..3da63fb1adc 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -12,18 +12,18 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-                    <group col="6" colspan="4">
+                    <group>
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
                         <field name='filter_id' invisible="context.get('active_model',False)"/>
-                        <field name="email_from" colspan="4" required="1"/>
-                        <field name="email_to" colspan="4" required="1"/>
-                        <field name="email_cc" colspan="4"/>
-                        <field name="email_bcc" colspan="4"/>
-                        <field name="reply_to" colspan="4"/>
-                        <field name="subject" colspan="4" widget="char" size="512"/>
-                        <field name="references" invisible="1"/>
-                        <field name="message_id" invisible="1"/>
+                        <field name="email_from" required="1"/>
+                        <field name="email_to" required="1"/>
+                        <field name="email_cc"/>
+                        <field name="email_bcc"/>
+                        <field name="reply_to"/>
+                        <field name="subject" widget="char" size="512"/>
+                        <field name="references"/>
+                        <field name="message_id"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Body">
-- 
cgit v1.2.3