From 93d815efab5c413058aef66488a3e7a8d5838a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 13 Mar 2013 13:51:24 +0100
Subject: [PATCH] [CLEAN] crm, res_partner: added name on added filters; added
 oline breaks in big help of notification_email_send.

bzr revid: tde@openerp.com-20130313125124-wbu17isbi6cay100
---
 addons/crm/crm_lead_view.xml               | 3 ++-
 addons/email_template/res_partner_view.xml | 3 ++-
 addons/mail/res_partner.py                 | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 4c055ce1436..91154b1ee5a 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -342,7 +342,8 @@
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
                             help="Leads that are assigned to any sales teams I am member of"/>
                     <separator />
-                    <filter string="Available for mass mailing" domain="[('opt_out', '=', False)]"
+                    <filter string="Available for mass mailing"
+                            name='not_opt_out' domain="[('opt_out', '=', False)]"
                             help="Leads that did not ask not to be included in mass mailing campaigns"/>
                     <separator />
                     <group expand="0" string="Group By...">
diff --git a/addons/email_template/res_partner_view.xml b/addons/email_template/res_partner_view.xml
index 1da3681d3af..1eab8029cb2 100644
--- a/addons/email_template/res_partner_view.xml
+++ b/addons/email_template/res_partner_view.xml
@@ -19,7 +19,8 @@
             <field name="arch" type="xml">
                     <filter string="Suppliers" position="after">
                         <separator />
-                        <filter string="Available for mass mailing" domain="[('opt_out', '=', False)]"
+                        <filter string="Available for mass mailing"
+                                name='not_opt_out' domain="[('opt_out', '=', False)]"
                                 help="Partners that did not ask not to be included in mass mailing campaigns" />
                     </filter>
             </field>
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 05f9fc2ace0..8527e60aba0 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -35,10 +35,10 @@ class res_partner_mail(osv.Model):
             ('comment', 'Incoming Emails and Discussions'),
             ('all', 'All Messages (discussions, emails, followed system notifications)'),
             ], 'Receive Messages by Email', required=True,
-            help="Policy to receive emails for new messages pushed to your personal Inbox:\n "
-                    "- Never: no emails are sent"
-                    "- Incoming Emails only: for messages received by the system via email"
-                    "- Incoming Emails and Discussions: for incoming emails along with internal discussions"
+            help="Policy to receive emails for new messages pushed to your personal Inbox:\n"
+                    "- Never: no emails are sent\n"
+                    "- Incoming Emails only: for messages received by the system via email\n"
+                    "- Incoming Emails and Discussions: for incoming emails along with internal discussions\n"
                     "- All Messages: for every notification you receive in your Inbox"),
     }