From 0a751bcae5ab2cc94f2ec7f744128f79845a9cef Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 8 Sep 2011 19:55:41 +0200
Subject: [PATCH] [IMP] email.template: typos and usability review

bzr revid: odo@openerp.com-20110908175541-h2qdchdwf60srksy
---
 addons/email_template/email_template.py       |  8 ++++++--
 addons/email_template/email_template_view.xml | 16 ++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index b11821a4081..56bcf31d632 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -97,8 +97,8 @@ class email_template(osv.osv):
     _columns = {
         'name': fields.char('Name', size=250),
         'model_id': fields.many2one('ir.model', 'Related document model'),
-        'lang': fields.char('Language code', size=250,
-                            help="Optional translation language to select when sending out an email. "
+        'lang': fields.char('Language Selection', size=250,
+                            help="Optional translation language (ISO code) to select when sending out an email. "
                                  "If not set, the english version will be used. "
                                  "This should usually be a placeholder expression "
                                  "that provides the appropriate language code, e.g. "
@@ -137,6 +137,9 @@ class email_template(osv.osv):
         'email_cc': fields.char('Cc', size=256, help="Carbon copy recipients (placeholders may be used here)"),
         'email_bcc': fields.char('Bcc', size=256, help="Blind carbon copy recipients (placeholders may be used here)"),
         'reply_to': fields.char('Reply-To', size=250, help="Preferred response address (placeholders may be used here)"),
+        'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False,
+                                          help="Optional preferred server for outgoing mails. If not set, the highest "
+                                               "priority one will be used."),
         'body_text': fields.text('Text contents', translate=True, help="Plaintext version of the message (placeholders may be used here)"),
         'body_html': fields.text('Rich-text contents', help="Rich-text/HTML version of the message (placeholders may be used here)"),
         'message_id': fields.char('Message-Id', size=256, help="Message-ID SMTP header to use in outgoing messages based on this template. "
@@ -208,6 +211,7 @@ class email_template(osv.osv):
                     ir_values_obj.unlink(cr, uid, template.ref_ir_value.id, context)
             except:
                 raise osv.except_osv(_("Warning"), _("Deletion of Record failed"))
+        return True
 
     def unlink(self, cr, uid, ids, context=None):
         self.unlink_action(cr, uid, ids, context=context)
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 61d2dfc12d4..fe460d8829d 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -25,7 +25,6 @@
                                 <separator string="Options" colspan="2"/>
                                 <field name="lang" colspan="4" />
                                 <field name="user_signature" colspan="4" />
-                                <field name="track_campaign_item" colspan="4"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Email Content"/>
@@ -63,23 +62,24 @@
                             </group>
                         </page>
                         <page string="Advanced">
-                            <field name="mail_server_id"/>
                             <group colspan="2" col="2">
                                 <group colspan="2" col="2">
                                     <separator string="Sidebar button" colspan="2"/>
                                     <button name="create_action" string="Add sidebar button" type="object" icon="gtk-execute"
-                                            colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False), ('ref_ir_value','!=',False)]}"
+                                            colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False)]}"
                                             help="Display a button in the sidebar of related documents to open a composition wizard with this template"
                                             />
-                                    <field name="ref_ir_act_window" attrs="{'invisible':[('ref_ir_act_window','!=',False), ('ref_ir_value','!=',False)]}"/>
-                                    <field name="ref_ir_value" attrs="{'invisible':[('ref_ir_act_window','!=',False), ('ref_ir_value','!=',False)]}"/>
+                                    <field name="ref_ir_act_window" attrs="{'invisible':[('ref_ir_act_window','=',False)]}"/>
+                                    <field name="ref_ir_value" attrs="{'invisible':[('ref_ir_act_window','=',False)]}"/>
                                     <button name="unlink_action" string="Remove sidebar button" type="object" icon="gtk-delete"
-                                            colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False), ('ref_ir_value','=',False)]}"
-                                            help="Remove the sidebar button currentlu displayed on related documents"
+                                            colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False)]}"
+                                            help="Remove the sidebar button currently displayed on related documents"
                                             />
                                 </group>
-                                <group colspan="2" col="2">
+                                <group colspan="2" col="2" groups="base.group_extended">
                                     <separator string="Advanced Options" colspan="2"/>
+                                    <field name="mail_server_id"/>
+                                    <field name="track_campaign_item" colspan="4"/>
                                     <field name="message_id"/>
                                     <field name="auto_delete"/>
                                 </group>