odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[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
This commit is contained in:
Thibault Delavallée 2013-03-13 13:51:24 +01:00
parent 3b989b2c57
commit 93d815efab
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/crm/crm_lead_view.xml
View File

@ -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...">

3
addons/email_template/res_partner_view.xml
View File

@ -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>

8
addons/mail/res_partner.py
View File

@ -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"),
}