[IMP] Improve view in email_template and email module.

bzr revid: ysa@tinyerp.com-20110208054339-7os49d348uerib9q

diff --git a/addons/email/email_view.xml b/addons/email/email_view.xml
index 009a264..ca5c879 100644 (file)
--- a/addons/email/email_view.xml
+++ b/addons/email/email_view.xml
@@ -6,16 +6,16 @@
               id="base.menu_lunch_survey_root" sequence="20" />
 
         <record model="ir.ui.view" id="view_email_message_form">
-          <field name="name">email.message.form</field>
-            <field name="model">email.message</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-             <form string="Email message">
+            <field name="name">email.message.form</field>
+                       <field name="model">email.message</field>
+                       <field name="type">form</field>
+                       <field name="arch" type="xml">
+                <form string="Email message">
                     <group colspan="4" col="6">
-                        <field name="name" widget="char" string="Subject" required="1"/>
-                        <field name="date" required="1"/>
-                        <field name="user_id" string="Owner"/>
-                        <field name="partner_id" readonly="1" />
+                       <field name="name" widget="char" required="1"/>
+                       <field name="date" required="1"/>
+                       <field name="user_id" string="Owner"/>
+                       <field name="partner_id" readonly="1" />
                     </group>
                     <notebook colspan="4">
                         <page string="Details">
@@ -26,8 +26,8 @@
                                 <field name="email_cc"/>
                                 <field name="email_bcc" groups="base.group_extended"/>
                                 <field name="reply_to"/>
-                           </group>
-                           <group col="2" colspan="2">
+                            </group>
+                            <group col="2" colspan="2">
                                 <separator string="Message Details" colspan="4"/>
                                 <field name="model" readonly="1"/>
                                 <group col="3" colspan="2">
@@ -35,14 +35,14 @@
                                     <button name="open_document" string="Open Document" type="object" icon="gtk-jump-to"/>
                                 </group>
                                 <field name="message_id"/>
-                           </group>
+                            </group>
                         </page>
                         <page string="Attachments">
                             <separator string="Attachments" colspan="4"/>
                             <field name="attachment_ids" nolabel="1" colspan="4" readonly="1"/>
                         </page>
                         <page string="Advanced">
-                            <field name="folder" colspan="2" select="2"/>
+                            <field name="folder" colspan="2"/>
                             <field name="state"/>
                             <field name="sub_type"/>
                             <field name="headers"/>
@@ -62,9 +62,9 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Emails">
-                    <field name="date" />
-                    <field name="name" string="Subject"/>
-                    <field name="email_from" string="From"/>
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="email_from"/>
                     <field name="user_id" string="Owner"/>
                     <field name="message_id" string="Message" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
@@ -80,18 +80,17 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Email Search">
-                    <field name="name" string="Subject"/>
-                    <field name="date" />
+                    <field name="name"/>
+                    <field name="date"/>
                     <field name="user_id" string="Owner"/>
                     <field name="partner_id" string="Partner Name"/>
-                    <newline/>
                     <group expand="0" string="Group By..." groups="base.group_extended">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Owner" 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'}"/>
+                        <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>
@@ -132,26 +131,26 @@
             <field name="arch" type="xml">
                 <form string="Email Smtp Server Configuration">
                     <group colspan="2">
-                        <field name="name" select="1" />
+                        <field name="name"/>
                         <field name="default"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Outgoing">
-                            <separator string="Server Information" colspan="4" />
+                            <separator string="Server Information" colspan="4"/>
                             <group colspan="4" col="4">
-                                <field name="smtpserver" select="1"/>
+                                <field name="smtpserver"/>
                                 <button name="check_outgoing_connection" type="object" string="Test Outgoing Connection" icon="gtk-network" colspan="2"/>
-                                <field name="smtpport" select="2" />
-                                <field name="smtpssl" select="2" />
-                                <field name="smtptls" select="2" />
+                                <field name="smtpport"/>
+                                <field name="smtpssl"/>
+                                <field name="smtptls"/>
                             </group>
-                            <separator string="User Information" colspan="4" />
+                            <separator string="User Information" colspan="4"/>
                             <group col="2" colspan="2">
-                                <field name="email_id" select="1" colspan="2" />
-                                <field name="smtppass" password="True" colspan="2" />
+                                <field name="email_id" colspan="2"/>
+                                <field name="smtppass" password="True" colspan="2"/>
                             </group>
                             <group col="2" colspan="2">
-                                <field name="smtpuname" select="1" colspan="2" />
+                                <field name="smtpuname" colspan="2"/>
                             </group>
                         </page>
                     </notebook>
@@ -165,25 +164,25 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Email Accounts">
-                    <field name="name" />
-                    <field name="email_id" />
-                    <field name="smtpuname" />
-                    <field name="smtpserver" />
-                    <field name="smtpport" />
+                    <field name="name"/>
+                    <field name="email_id"/>
+                    <field name="smtpuname"/>
+                    <field name="smtpserver"/>
+                    <field name="smtpport"/>
                 </tree>
             </field>
         </record>
 
-       <record id="view_email_smtp_server_search" model="ir.ui.view">
-           <field name="name">email_smtp.server.search</field>
-           <field name="model">email.smtp_server</field>
-           <field name="type">search</field>
-           <field name="arch" type="xml">
-               <search string="Email Smtp Server">
-                    <field name="name" select="1"/>
-                    <field name="email_id" select="1"/>
-               </search>
-           </field>
+        <record id="view_email_smtp_server_search" model="ir.ui.view">
+            <field name="name">email_smtp.server.search</field>
+            <field name="model">email.smtp_server</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Email Smtp Server">
+                    <field name="name"/>
+                    <field name="email_id"/>
+                </search>
+            </field>
         </record>
 
         <record model="ir.actions.act_window" id="action_email_smtp_server_tree_all">
@@ -196,10 +195,9 @@
             <field name="search_view_id" ref="view_email_smtp_server_search"/>
         </record>
 
-        <menuitem name="Email" id="menu_config_email"
-              parent="base.menu_lunch_survey_root" sequence="20" />
+        <menuitem name="Email" id="menu_config_email" parent="base.menu_lunch_survey_root" sequence="20"/>
 
         <menuitem name="Email Smtp Server" id="menu_email_smtp_server_all" parent="menu_config_email" action="action_email_smtp_server_tree_all"/>
 
     </data>
-</openerp>
+</openerp>
\ No newline at end of file

diff --git a/addons/email/res_partner_view.xml b/addons/email/res_partner_view.xml
index b3d956f..21da7d7 100644 (file)
--- a/addons/email/res_partner_view.xml
+++ b/addons/email/res_partner_view.xml
@@ -3,28 +3,28 @@
     <data>
 
          <!--  Partners inherited form -->
-         <record id="base.view_crm_partner_info_History" model="ir.ui.view">
-             <field name="name">res.partner.crm.history.inherit1</field>
-             <field name="model">res.partner</field>
-             <field name="type">form</field>
-             <field name="inherit_id" ref="base.view_partner_form"/>
-             <field name="arch" type="xml">
-                 <xpath expr="/form/notebook/page[@string='History']" position="attributes">
-                     <attribute name="invisible">False</attribute>
-                 </xpath>
-             </field>
-             </record>
+        <record id="base.view_crm_partner_info_History" model="ir.ui.view">
+            <field name="name">res.partner.crm.history.inherit1</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page[@string='History']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+            </field>
+        </record>
         <record id="view_emails_partner_info_form" model="ir.ui.view">
             <field name="name">res.partner.emails.info.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                 <page string="History" position="inside">
-                      <field name="emails" colspan="4" nolabel="1"/>
-                 </page>
+                <page string="History" position="inside">
+                    <field name="emails" colspan="4" nolabel="1"/>
+                </page>
             </field>
-       </record>
-   </data>
-</openerp>
+        </record>
 
+   </data>
+</openerp>
\ No newline at end of file

diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 236db1d..cedd418 100644 (file)
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -155,7 +155,7 @@
         <menuitem name="Email Templates" id="menu_email_template_all_tools"
             parent="email.menu_config_email" action="action_email_template_tree_all" />
 
-               <!-- Inherit email.message view -->
+        <!-- Inherit email.message view -->
 
         <record model="ir.ui.view" id="view_email_message_template_form">
             <field name="name">email.message.template.form</field>
@@ -165,7 +165,7 @@
             <field name="arch" type="xml">
                    <field name="debug" position="after">
                        <field name="template_id"/>
-                   </field>
+                </field>
             </field>
         </record>
 

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 c92f0c2..f64e9dc 100644 (file)
--- 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