From ab3aeb31a894dcc922f9efea175fbf685a3ba3c7 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 8 Feb 2011 10:43:34 +0530
Subject: [IMP] Improve view in email_template.

bzr revid: ysa@tinyerp.com-20110208051334-bc6k96r4cyc7hx1k
---
 .../wizard/email_template_send_wizard_view.xml     | 50 ++++++++++------------
 1 file changed, 23 insertions(+), 27 deletions(-)

(limited to 'addons/email_template/wizard/email_template_send_wizard_view.xml')

diff --git a/addons/email_template/wizard/email_template_send_wizard_view.xml b/addons/email_template/wizard/email_template_send_wizard_view.xml
index a5ad037aee6..c92f0c2460d 100644
--- a/addons/email_template/wizard/email_template_send_wizard_view.xml
+++ b/addons/email_template/wizard/email_template_send_wizard_view.xml
@@ -9,55 +9,51 @@
 			<field name="arch" type="xml">
 				<form string="Send mail Wizard">
 					<group col="4" colspan="4">
-						<field name="rel_model" colspan="2" />
-						<field name="from" required="1" colspan="2" />
+						<field name="rel_model" colspan="2"/>
+						<field name="from" required="1" colspan="2"/>
 					</group>
 					<group col="4" colspan="4">
 						<group col="6" colspan="4">
-							<field name="to" select="1" colspan="4" />
-							<newline />
-							<field name="cc" select="2" colspan="4" />
-							<newline />
-							<field name="bcc" select="2" colspan="4" />
-							<newline />
-							<field name="subject" select="2" colspan="4" attrs="{'required':[('state','=','single')]}" />
-							<newline />
-							<field name="report" colspan="4" />
+							<field name="to" colspan="4"/>
+							<field name="cc" colspan="4"/>
+							<field name="bcc" colspan="4"/>
+							<field name="subject" colspan="4" attrs="{'required':[('state','=','single')]}"/>
+							<field name="report" colspan="4"/>
 						</group>
-						<separator string="" colspan="4" />
+						<separator string="" colspan="4"/>
 						<notebook colspan="4">
 							<page string="Body (Plain Text)">
-								<field name="body_text" select="2" colspan="4" nolabel="1" />
+								<field name="body_text" select="2" colspan="4" nolabel="1"/>
 							</page>
 							<page string="Body (HTML)">
-								<field name="body_html" select="2" colspan="4" nolabel="1" />
+								<field name="body_html" select="2" colspan="4" nolabel="1"/>
 							</page>
 							<page string="Attachments">
 								<label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
 								<field name="attachment_ids" colspan="4" nolabel="1"/>
 							</page>
 						</notebook>
-						<field name="signature" colspan="4" />
+						<field name="signature" colspan="4"/>
 					</group>
 					<group col="4" colspan="4" attrs="{'invisible':[('state','!=','single')]}">
-						<button icon="gtk-apply" name="sav_to_drafts" string="Save in Drafts" type="object" />
-						<button icon="gtk-ok" name="send_mail" string="Send now" type="object" />
-						<button icon="gtk-cancel" special="cancel" string="Discard Mail" />
+						<button icon="gtk-apply" name="sav_to_drafts" string="Save in Drafts" type="object"/>
+						<button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
+						<button icon="gtk-cancel" special="cancel" string="Discard Mail"/>
 					</group>
 					<group col="4" colspan="4" attrs="{'invisible':[('state','=','single')]}">
 					    <label string="Tip: Multiple emails are sent in the same language (the first one is proposed). We suggest you send emails in groups according to language." colspan="4"/>
-						<field name="requested" />
-						<field name="generated" />
-						<button icon="gtk-ok" name="get_generated" string="Send all mails" type="object" states="multi" colspan="2" />
-						<button icon="gtk-cancel" special="cancel" string="Discard Mail" colspan="2" states="multi" />
+						<field name="requested"/>
+						<field name="generated"/>
+						<button icon="gtk-ok" name="get_generated" string="Send all mails" type="object" states="multi" colspan="2"/>
+						<button icon="gtk-cancel" special="cancel" string="Discard Mail" colspan="2" states="multi"/>
 					</group>
-					<button icon="gtk-ok" special="cancel" string="Close" colspan="4" states="done" />
-					<field name="state" />
-					<newline />
+					<button icon="gtk-ok" special="cancel" string="Close" colspan="4" states="done"/>
+					<field name="state"/>
+					<newline/>
 					<label string="After clicking send all mails, mails will be sent to outbox and cleared in next Send/Recieve" colspan="4"/>
 				</form>
 			</field>
 		</record>
-	</data>
-</openerp>
 
+	</data>
+</openerp>
\ No newline at end of file
-- 
cgit v1.2.3


From defc1aaf96b19f9f61a61980fa12c0df708a4261 Mon Sep 17 00:00:00 2001
From: "Yogesh (OpenERP)" <ysa@tinyerp.com>
Date: Tue, 8 Feb 2011 11:13:39 +0530
Subject: [IMP] Improve view in email_template and email module.

bzr revid: ysa@tinyerp.com-20110208054339-7os49d348uerib9q
---
 .../wizard/email_template_send_wizard_view.xml     | 104 ++++++++++-----------
 1 file changed, 52 insertions(+), 52 deletions(-)

(limited to 'addons/email_template/wizard/email_template_send_wizard_view.xml')

diff --git a/addons/email_template/wizard/email_template_send_wizard_view.xml b/addons/email_template/wizard/email_template_send_wizard_view.xml
index c92f0c2460d..f64e9dc2e52 100644
--- a/addons/email_template/wizard/email_template_send_wizard_view.xml
+++ b/addons/email_template/wizard/email_template_send_wizard_view.xml
@@ -2,58 +2,58 @@
 <openerp>
 	<data>
 
-		<record model="ir.ui.view" id="email_template_send_wizard_form">
-			<field name="name">email_template.send.wizard.form</field>
-			<field name="model">email_template.send.wizard</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Send mail Wizard">
-					<group col="4" colspan="4">
-						<field name="rel_model" colspan="2"/>
-						<field name="from" required="1" colspan="2"/>
-					</group>
-					<group col="4" colspan="4">
-						<group col="6" colspan="4">
-							<field name="to" colspan="4"/>
-							<field name="cc" colspan="4"/>
-							<field name="bcc" colspan="4"/>
-							<field name="subject" colspan="4" attrs="{'required':[('state','=','single')]}"/>
-							<field name="report" colspan="4"/>
-						</group>
-						<separator string="" colspan="4"/>
-						<notebook colspan="4">
-							<page string="Body (Plain Text)">
-								<field name="body_text" select="2" colspan="4" nolabel="1"/>
-							</page>
-							<page string="Body (HTML)">
-								<field name="body_html" select="2" colspan="4" nolabel="1"/>
-							</page>
-							<page string="Attachments">
-								<label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
-								<field name="attachment_ids" colspan="4" nolabel="1"/>
-							</page>
-						</notebook>
-						<field name="signature" colspan="4"/>
-					</group>
-					<group col="4" colspan="4" attrs="{'invisible':[('state','!=','single')]}">
-						<button icon="gtk-apply" name="sav_to_drafts" string="Save in Drafts" type="object"/>
-						<button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
-						<button icon="gtk-cancel" special="cancel" string="Discard Mail"/>
-					</group>
-					<group col="4" colspan="4" attrs="{'invisible':[('state','=','single')]}">
-					    <label string="Tip: Multiple emails are sent in the same language (the first one is proposed). We suggest you send emails in groups according to language." colspan="4"/>
-						<field name="requested"/>
-						<field name="generated"/>
-						<button icon="gtk-ok" name="get_generated" string="Send all mails" type="object" states="multi" colspan="2"/>
-						<button icon="gtk-cancel" special="cancel" string="Discard Mail" colspan="2" states="multi"/>
-					</group>
-					<button icon="gtk-ok" special="cancel" string="Close" colspan="4" states="done"/>
-					<field name="state"/>
-					<newline/>
-					<label string="After clicking send all mails, mails will be sent to outbox and cleared in next Send/Recieve" colspan="4"/>
-				</form>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="email_template_send_wizard_form">
+            <field name="name">email_template.send.wizard.form</field>
+            <field name="model">email_template.send.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Send mail Wizard">
+                    <group col="4" colspan="4">
+                        <field name="rel_model" colspan="2"/>
+                        <field name="from" required="1" colspan="2"/>
+                    </group>
+                    <group col="4" colspan="4">
+                        <group col="6" colspan="4">
+                            <field name="to" colspan="4"/>
+                            <field name="cc" colspan="4"/>
+                            <field name="bcc" colspan="4"/>
+                            <field name="subject" colspan="4" attrs="{'required':[('state','=','single')]}"/>
+                            <field name="report" colspan="4"/>
+                        </group>
+                        <separator string="" colspan="4"/>
+                        <notebook colspan="4">
+                            <page string="Body (Plain Text)">
+                                <field name="body_text" colspan="4" nolabel="1"/>
+                            </page>
+                            <page string="Body (HTML)">
+                                <field name="body_html" colspan="4" nolabel="1"/>
+                            </page>
+                            <page string="Attachments">
+                                <label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
+                                <field name="attachment_ids" colspan="4" nolabel="1"/>
+                            </page>
+                        </notebook>
+                        <field name="signature" colspan="4"/>
+                    </group>
+                    <group col="4" colspan="4" attrs="{'invisible':[('state','!=','single')]}">
+                        <button icon="gtk-apply" name="sav_to_drafts" string="Save in Drafts" type="object"/>
+                        <button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Discard Mail"/>
+                    </group>
+                    <group col="4" colspan="4" attrs="{'invisible':[('state','=','single')]}">
+                        <label string="Tip: Multiple emails are sent in the same language (the first one is proposed). We suggest you send emails in groups according to language." colspan="4"/>
+                        <field name="requested"/>
+                        <field name="generated"/>
+                        <button icon="gtk-ok" name="get_generated" string="Send all mails" type="object" states="multi" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Discard Mail" colspan="2" states="multi"/>
+                    </group>
+                    <button icon="gtk-ok" special="cancel" string="Close" colspan="4" states="done"/>
+                    <field name="state"/>
+                    <newline/>
+                    <label string="After clicking send all mails, mails will be sent to outbox and cleared in next Send/Recieve" colspan="4"/>
+                </form>
+            </field>
+        </record>
 
 	</data>
 </openerp>
\ No newline at end of file
-- 
cgit v1.2.3


From 72220cb09b96b907e29cfb31fda39bf67bd1eb02 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 15 Feb 2011 01:19:36 +0530
Subject: [REVIEW+IMP] email_template: inherit related improvement

bzr revid: hmo@tinyerp.com-20110214194936-92himmpn80ytmjim
---
 .../wizard/email_template_send_wizard_view.xml     | 57 ++++++++++++----------
 1 file changed, 32 insertions(+), 25 deletions(-)

(limited to 'addons/email_template/wizard/email_template_send_wizard_view.xml')

diff --git a/addons/email_template/wizard/email_template_send_wizard_view.xml b/addons/email_template/wizard/email_template_send_wizard_view.xml
index f64e9dc2e52..90c2648b1de 100644
--- a/addons/email_template/wizard/email_template_send_wizard_view.xml
+++ b/addons/email_template/wizard/email_template_send_wizard_view.xml
@@ -7,53 +7,60 @@
             <field name="model">email_template.send.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Send mail Wizard">
+                <form string="Send Email Wizard">
                     <group col="4" colspan="4">
-                        <field name="rel_model" colspan="2"/>
-                        <field name="from" required="1" colspan="2"/>
+                        <field name="smtp_server_id" widget="selection" required="1" colspan="4"/>
                     </group>
                     <group col="4" colspan="4">
                         <group col="6" colspan="4">
-                            <field name="to" colspan="4"/>
-                            <field name="cc" colspan="4"/>
-                            <field name="bcc" colspan="4"/>
+                            <field name="email_to" colspan="4"/>
+                            <field name="email_cc" colspan="4"/>
+                            <field name="email_bcc" colspan="4"/>
                             <field name="subject" colspan="4" attrs="{'required':[('state','=','single')]}"/>
-                            <field name="report" colspan="4"/>
+                            <field name="report_name" colspan="4"/>
+                            <field name="user_signature" colspan="4"/>
                         </group>
                         <separator string="" colspan="4"/>
                         <notebook colspan="4">
-                            <page string="Body (Plain Text)">
-                                <field name="body_text" colspan="4" nolabel="1"/>
+                            <page string="Body">
+                                <field name="description" colspan="4" nolabel="1"/>
                             </page>
-                            <page string="Body (HTML)">
+                            <!-- <page string="Body (HTML)">
                                 <field name="body_html" colspan="4" nolabel="1"/>
-                            </page>
+                            </page> -->
                             <page string="Attachments">
                                 <label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
                                 <field name="attachment_ids" colspan="4" nolabel="1"/>
                             </page>
                         </notebook>
-                        <field name="signature" colspan="4"/>
-                    </group>
-                    <group col="4" colspan="4" attrs="{'invisible':[('state','!=','single')]}">
-                        <button icon="gtk-apply" name="sav_to_drafts" string="Save in Drafts" type="object"/>
-                        <button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Discard Mail"/>
+                        
                     </group>
+                    <field name="state" invisible="1"/>
                     <group col="4" colspan="4" attrs="{'invisible':[('state','=','single')]}">
-                        <label string="Tip: Multiple emails are sent in the same language (the first one is proposed). We suggest you send emails in groups according to language." colspan="4"/>
                         <field name="requested"/>
                         <field name="generated"/>
-                        <button icon="gtk-ok" name="get_generated" string="Send all mails" type="object" states="multi" colspan="2"/>
-                        <button icon="gtk-cancel" special="cancel" string="Discard Mail" colspan="2" states="multi"/>
+                        <newline/>
+                        <label string="After clicking Send All, emails will be sent to outbox and cleared in next Send/Recieve" colspan="4"/>
+                        <label string="Tip: Multiple emails are sent in the same language (the first one is proposed). We suggest you send emails in groups according to language." colspan="4"/>
+                        <newline/>
+                    </group>
+                    <label string="" colspan="2"/>
+                    <group col="4" colspan="2" attrs="{'invisible':[('state','=','single')]}">
+                        <button icon="gtk-cancel" special="cancel" string="Discard"  states="multi"/>
+                        <button icon="gtk-ok" name="get_generated" string="Send All" type="object" states="multi"/>
+                        <button icon="gtk-ok" special="cancel" string="Close" states="done"/>
+                    </group>
+                    <group col="4" colspan="2" attrs="{'invisible':[('state','!=','single')]}">
+                        <button icon="gtk-cancel" special="cancel" string="Discard"/>
+                        <button icon="gtk-apply" name="save_to_drafts" string="Save in Drafts" type="object"/>
+                        <button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
                     </group>
-                    <button icon="gtk-ok" special="cancel" string="Close" colspan="4" states="done"/>
-                    <field name="state"/>
-                    <newline/>
-                    <label string="After clicking send all mails, mails will be sent to outbox and cleared in next Send/Recieve" colspan="4"/>
+                    
+                    
+                    
                 </form>
             </field>
         </record>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
-- 
cgit v1.2.3


From afc74ed47f09bca7130d310268588916aefeb09e Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 7 Apr 2011 10:26:07 +0530
Subject: [IMP] email.compose.message: removed method save_to_drafts() and did
 related changes for this

bzr revid: rha@tinyerp.com-20110407045607-tub41samcup20t5d
---
 addons/email_template/wizard/email_template_send_wizard_view.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'addons/email_template/wizard/email_template_send_wizard_view.xml')

diff --git a/addons/email_template/wizard/email_template_send_wizard_view.xml b/addons/email_template/wizard/email_template_send_wizard_view.xml
index 90c2648b1de..f82288575bb 100644
--- a/addons/email_template/wizard/email_template_send_wizard_view.xml
+++ b/addons/email_template/wizard/email_template_send_wizard_view.xml
@@ -33,7 +33,7 @@
                                 <field name="attachment_ids" colspan="4" nolabel="1"/>
                             </page>
                         </notebook>
-                        
+
                     </group>
                     <field name="state" invisible="1"/>
                     <group col="4" colspan="4" attrs="{'invisible':[('state','=','single')]}">
@@ -52,12 +52,8 @@
                     </group>
                     <group col="4" colspan="2" attrs="{'invisible':[('state','!=','single')]}">
                         <button icon="gtk-cancel" special="cancel" string="Discard"/>
-                        <button icon="gtk-apply" name="save_to_drafts" string="Save in Drafts" type="object"/>
                         <button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
                     </group>
-                    
-                    
-                    
                 </form>
             </field>
         </record>
-- 
cgit v1.2.3


From 99bac0b9be878df5ccdb9c1118f4cb2245b35be7 Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Thu, 14 Apr 2011 18:49:38 +0530
Subject: [REM] email_template: remove email_template_send wizard and IMP

bzr revid: rha@tinyerp.com-20110414131938-5y133uyx5j7hl5v0
---
 .../wizard/email_template_send_wizard_view.xml     | 62 ----------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 addons/email_template/wizard/email_template_send_wizard_view.xml

(limited to 'addons/email_template/wizard/email_template_send_wizard_view.xml')

diff --git a/addons/email_template/wizard/email_template_send_wizard_view.xml b/addons/email_template/wizard/email_template_send_wizard_view.xml
deleted file mode 100644
index f82288575bb..00000000000
--- a/addons/email_template/wizard/email_template_send_wizard_view.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data>
-
-        <record model="ir.ui.view" id="email_template_send_wizard_form">
-            <field name="name">email_template.send.wizard.form</field>
-            <field name="model">email_template.send.wizard</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Send Email Wizard">
-                    <group col="4" colspan="4">
-                        <field name="smtp_server_id" widget="selection" required="1" colspan="4"/>
-                    </group>
-                    <group col="4" colspan="4">
-                        <group col="6" colspan="4">
-                            <field name="email_to" colspan="4"/>
-                            <field name="email_cc" colspan="4"/>
-                            <field name="email_bcc" colspan="4"/>
-                            <field name="subject" colspan="4" attrs="{'required':[('state','=','single')]}"/>
-                            <field name="report_name" colspan="4"/>
-                            <field name="user_signature" colspan="4"/>
-                        </group>
-                        <separator string="" colspan="4"/>
-                        <notebook colspan="4">
-                            <page string="Body">
-                                <field name="description" colspan="4" nolabel="1"/>
-                            </page>
-                            <!-- <page string="Body (HTML)">
-                                <field name="body_html" colspan="4" nolabel="1"/>
-                            </page> -->
-                            <page string="Attachments">
-                                <label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
-                                <field name="attachment_ids" colspan="4" nolabel="1"/>
-                            </page>
-                        </notebook>
-
-                    </group>
-                    <field name="state" invisible="1"/>
-                    <group col="4" colspan="4" attrs="{'invisible':[('state','=','single')]}">
-                        <field name="requested"/>
-                        <field name="generated"/>
-                        <newline/>
-                        <label string="After clicking Send All, emails will be sent to outbox and cleared in next Send/Recieve" colspan="4"/>
-                        <label string="Tip: Multiple emails are sent in the same language (the first one is proposed). We suggest you send emails in groups according to language." colspan="4"/>
-                        <newline/>
-                    </group>
-                    <label string="" colspan="2"/>
-                    <group col="4" colspan="2" attrs="{'invisible':[('state','=','single')]}">
-                        <button icon="gtk-cancel" special="cancel" string="Discard"  states="multi"/>
-                        <button icon="gtk-ok" name="get_generated" string="Send All" type="object" states="multi"/>
-                        <button icon="gtk-ok" special="cancel" string="Close" states="done"/>
-                    </group>
-                    <group col="4" colspan="2" attrs="{'invisible':[('state','!=','single')]}">
-                        <button icon="gtk-cancel" special="cancel" string="Discard"/>
-                        <button icon="gtk-ok" name="send_mail" string="Send now" type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-	</data>
-</openerp>
-- 
cgit v1.2.3