[MERGE] merge from trunk addons

[odoo/odoo.git] / addons / email_template / email_template_mailbox_view.xml

diff --git a/addons/email_template/email_template_mailbox_view.xml b/addons/email_template/email_template_mailbox_view.xml
old mode 100644 (file)
new mode 100755 (executable)
index 5861951..bb84ad5
--- a/addons/email_template/email_template_mailbox_view.xml
+++ b/addons/email_template/email_template_mailbox_view.xml
@@ -89,7 +89,7 @@
                     <field name="email_from"/>
                     <field name="user">
                         <filter icon="terp-personal"
-                            string="My Emails" name="myemails"
+                            string="My Emails" help="My Emails" name="myemails"
                             domain="[('account_id.user','=', uid)]" />
                     </field>
                     <newline/>
@@ -106,6 +106,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_email_template_mailbox_tree" />
             <field name="context">{'group_by': [], 'search_default_outbox': 1}</field>
+            <field name="help">An email template is an email document that will be sent as part of a marketing campaign. You can personalize it according to specific customer profile fields, so that a partner name or other partner related information may be inserted automatically.</field>
             <field name="search_view_id" ref="view_email_template_mailbox_search"/>
         </record>