[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:
parent
3b989b2c57
commit
93d815efab
|
@ -342,7 +342,8 @@
|
||||||
domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
|
domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
|
||||||
help="Leads that are assigned to any sales teams I am member of"/>
|
help="Leads that are assigned to any sales teams I am member of"/>
|
||||||
<separator />
|
<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"/>
|
help="Leads that did not ask not to be included in mass mailing campaigns"/>
|
||||||
<separator />
|
<separator />
|
||||||
<group expand="0" string="Group By...">
|
<group expand="0" string="Group By...">
|
||||||
|
|
|
@ -19,7 +19,8 @@
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<filter string="Suppliers" position="after">
|
<filter string="Suppliers" position="after">
|
||||||
<separator />
|
<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" />
|
help="Partners that did not ask not to be included in mass mailing campaigns" />
|
||||||
</filter>
|
</filter>
|
||||||
</field>
|
</field>
|
||||||
|
|
|
@ -35,10 +35,10 @@ class res_partner_mail(osv.Model):
|
||||||
('comment', 'Incoming Emails and Discussions'),
|
('comment', 'Incoming Emails and Discussions'),
|
||||||
('all', 'All Messages (discussions, emails, followed system notifications)'),
|
('all', 'All Messages (discussions, emails, followed system notifications)'),
|
||||||
], 'Receive Messages by Email', required=True,
|
], 'Receive Messages by Email', required=True,
|
||||||
help="Policy to receive emails for new messages pushed to your personal Inbox:\n "
|
help="Policy to receive emails for new messages pushed to your personal Inbox:\n"
|
||||||
"- Never: no emails are sent"
|
"- Never: no emails are sent\n"
|
||||||
"- Incoming Emails only: for messages received by the system via email"
|
"- Incoming Emails only: for messages received by the system via email\n"
|
||||||
"- Incoming Emails and Discussions: for incoming emails along with internal discussions"
|
"- Incoming Emails and Discussions: for incoming emails along with internal discussions\n"
|
||||||
"- All Messages: for every notification you receive in your Inbox"),
|
"- All Messages: for every notification you receive in your Inbox"),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue