[IMP] change field name notificatio_email_send to notify_email and none selection key instead of never
bzr revid: avo@tinyerp.com-20140409101604-1l8ltrcpjps8pazi
This commit is contained in:
parent
28a96d2651
commit
cfbd8ae9f8
|
@ -42,7 +42,7 @@
|
||||||
|
|
||||||
<!-- Admin should not receivve emails at creation -->
|
<!-- Admin should not receivve emails at creation -->
|
||||||
<record id="base.partner_root" model="res.partner">
|
<record id="base.partner_root" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- Catchall Email Alias -->
|
<!-- Catchall Email Alias -->
|
||||||
|
|
|
@ -4,76 +4,76 @@
|
||||||
|
|
||||||
<!-- Update 'Demo user' and partners email preferences to avoid mail bombing -->
|
<!-- Update 'Demo user' and partners email preferences to avoid mail bombing -->
|
||||||
<record id="base.partner_demo" model="res.partner">
|
<record id="base.partner_demo" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_1" model="res.partner">
|
<record id="base.res_partner_1" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_2" model="res.partner">
|
<record id="base.res_partner_2" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_3" model="res.partner">
|
<record id="base.res_partner_3" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_4" model="res.partner">
|
<record id="base.res_partner_4" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_5" model="res.partner">
|
<record id="base.res_partner_5" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_6" model="res.partner">
|
<record id="base.res_partner_6" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_7" model="res.partner">
|
<record id="base.res_partner_7" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_8" model="res.partner">
|
<record id="base.res_partner_8" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_9" model="res.partner">
|
<record id="base.res_partner_9" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_10" model="res.partner">
|
<record id="base.res_partner_10" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_11" model="res.partner">
|
<record id="base.res_partner_11" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_12" model="res.partner">
|
<record id="base.res_partner_12" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_13" model="res.partner">
|
<record id="base.res_partner_13" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_14" model="res.partner">
|
<record id="base.res_partner_14" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_15" model="res.partner">
|
<record id="base.res_partner_15" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_16" model="res.partner">
|
<record id="base.res_partner_16" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_17" model="res.partner">
|
<record id="base.res_partner_17" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_18" model="res.partner">
|
<record id="base.res_partner_18" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_19" model="res.partner">
|
<record id="base.res_partner_19" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_20" model="res.partner">
|
<record id="base.res_partner_20" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_21" model="res.partner">
|
<record id="base.res_partner_21" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_22" model="res.partner">
|
<record id="base.res_partner_22" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
<record id="base.res_partner_23" model="res.partner">
|
<record id="base.res_partner_23" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- Discussion: attachments and spec [DEMO: search on has_attachments -->
|
<!-- Discussion: attachments and spec [DEMO: search on has_attachments -->
|
||||||
|
|
|
@ -96,10 +96,10 @@ class mail_notification(osv.Model):
|
||||||
if message.author_id and message.author_id.email == partner.email:
|
if message.author_id and message.author_id.email == partner.email:
|
||||||
continue
|
continue
|
||||||
# Partner does not want to receive any emails or is opt-out
|
# Partner does not want to receive any emails or is opt-out
|
||||||
if partner.notification_email_send == 'never':
|
if partner.notify_email == 'none':
|
||||||
continue
|
continue
|
||||||
# Partner wants to receive emails, comments and notification
|
# Partner wants to receive emails, comments and notification
|
||||||
if partner.notification_email_send == 'always' and message.type not in ('email', 'comment', 'notification'):
|
if partner.notify_email == 'always' and message.type not in ('email', 'comment', 'notification'):
|
||||||
continue
|
continue
|
||||||
notify_pids.append(partner.id)
|
notify_pids.append(partner.id)
|
||||||
return notify_pids
|
return notify_pids
|
||||||
|
|
|
@ -30,8 +30,8 @@ class res_partner_mail(osv.Model):
|
||||||
_mail_flat_thread = False
|
_mail_flat_thread = False
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'notification_email_send': fields.selection([
|
'notify_email': fields.selection([
|
||||||
('never', 'Never'),
|
('none', 'Never'),
|
||||||
('always', 'All Messages'),
|
('always', 'All Messages'),
|
||||||
], '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"
|
||||||
|
@ -40,7 +40,7 @@ class res_partner_mail(osv.Model):
|
||||||
}
|
}
|
||||||
|
|
||||||
_defaults = {
|
_defaults = {
|
||||||
'notification_email_send': lambda *args: 'always'
|
'notify_email': lambda *args: 'always'
|
||||||
}
|
}
|
||||||
|
|
||||||
def message_get_suggested_recipients(self, cr, uid, ids, context=None):
|
def message_get_suggested_recipients(self, cr, uid, ids, context=None):
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<field name="inherit_id" ref="base.view_partner_form"/>
|
<field name="inherit_id" ref="base.view_partner_form"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//field[@name='active']" position="after">
|
<xpath expr="//field[@name='active']" position="after">
|
||||||
<field name='notification_email_send' widget="radio"/>
|
<field name='notify_email' widget="radio"/>
|
||||||
</xpath>
|
</xpath>
|
||||||
<xpath expr="//sheet" position="after">
|
<xpath expr="//sheet" position="after">
|
||||||
<div class="oe_chatter">
|
<div class="oe_chatter">
|
||||||
|
|
|
@ -54,10 +54,10 @@ class res_users(osv.Model):
|
||||||
init_res = super(res_users, self).__init__(pool, cr)
|
init_res = super(res_users, self).__init__(pool, cr)
|
||||||
# duplicate list to avoid modifying the original reference
|
# duplicate list to avoid modifying the original reference
|
||||||
self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
|
self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
|
||||||
self.SELF_WRITEABLE_FIELDS.extend(['notification_email_send', 'display_groups_suggestions'])
|
self.SELF_WRITEABLE_FIELDS.extend(['notify_email', 'display_groups_suggestions'])
|
||||||
# duplicate list to avoid modifying the original reference
|
# duplicate list to avoid modifying the original reference
|
||||||
self.SELF_READABLE_FIELDS = list(self.SELF_READABLE_FIELDS)
|
self.SELF_READABLE_FIELDS = list(self.SELF_READABLE_FIELDS)
|
||||||
self.SELF_READABLE_FIELDS.extend(['notification_email_send', 'alias_domain', 'alias_name', 'display_groups_suggestions'])
|
self.SELF_READABLE_FIELDS.extend(['notify_email', 'alias_domain', 'alias_name', 'display_groups_suggestions'])
|
||||||
return init_res
|
return init_res
|
||||||
|
|
||||||
def _auto_init(self, cr, context=None):
|
def _auto_init(self, cr, context=None):
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<data>
|
<data>
|
||||||
<field name="email" position="before">
|
<field name="email" position="before">
|
||||||
<field name="notification_email_send" widget="radio" readonly="0"/>
|
<field name="notify_email" widget="radio" readonly="0"/>
|
||||||
</field>
|
</field>
|
||||||
</data>
|
</data>
|
||||||
</field>
|
</field>
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<data>
|
<data>
|
||||||
<field name="signature" position="before">
|
<field name="signature" position="before">
|
||||||
<field name="notification_email_send" widget="radio"/>
|
<field name="notify_email" widget="radio"/>
|
||||||
</field>
|
</field>
|
||||||
<field name="signature" position="before">
|
<field name="signature" position="before">
|
||||||
<label for="alias_id" string="Messaging Alias" class="oe_read_only"
|
<label for="alias_id" string="Messaging Alias" class="oe_read_only"
|
||||||
|
|
|
@ -44,7 +44,7 @@ instance.web.form.FieldMany2ManyTagsEmail = instance.web.form.FieldMany2ManyTags
|
||||||
new instance.web.Model('res.partner').call("search", [[
|
new instance.web.Model('res.partner').call("search", [[
|
||||||
["id", "in", ids],
|
["id", "in", ids],
|
||||||
["email", "=", false],
|
["email", "=", false],
|
||||||
["notification_email_send", "=", 'always'] ]],
|
["notify_email", "=", 'always'] ]],
|
||||||
{context: this.build_context()})
|
{context: this.build_context()})
|
||||||
.then(function (record_ids) {
|
.then(function (record_ids) {
|
||||||
// valid partner
|
// valid partner
|
||||||
|
|
|
@ -77,7 +77,7 @@ class TestMail(common.TransactionCase):
|
||||||
'alias_name': 'ernest',
|
'alias_name': 'ernest',
|
||||||
'email': 'e.e@example.com',
|
'email': 'e.e@example.com',
|
||||||
'signature': '--\nErnest',
|
'signature': '--\nErnest',
|
||||||
'notification_email_send': 'always',
|
'notify_email': 'always',
|
||||||
'groups_id': [(6, 0, [self.group_employee_id])]
|
'groups_id': [(6, 0, [self.group_employee_id])]
|
||||||
}, {'no_reset_password': True})
|
}, {'no_reset_password': True})
|
||||||
self.user_noone_id = self.res_users.create(cr, uid, {
|
self.user_noone_id = self.res_users.create(cr, uid, {
|
||||||
|
@ -86,7 +86,7 @@ class TestMail(common.TransactionCase):
|
||||||
'alias_name': 'noemie',
|
'alias_name': 'noemie',
|
||||||
'email': 'n.n@example.com',
|
'email': 'n.n@example.com',
|
||||||
'signature': '--\nNoemie',
|
'signature': '--\nNoemie',
|
||||||
'notification_email_send': 'always',
|
'notify_email': 'always',
|
||||||
'groups_id': [(6, 0, [])]
|
'groups_id': [(6, 0, [])]
|
||||||
}, {'no_reset_password': True})
|
}, {'no_reset_password': True})
|
||||||
|
|
||||||
|
|
|
@ -366,14 +366,14 @@ class test_mail(TestMail):
|
||||||
# Data creation
|
# Data creation
|
||||||
# --------------------------------------------------
|
# --------------------------------------------------
|
||||||
# 0 - Update existing users-partners
|
# 0 - Update existing users-partners
|
||||||
self.res_users.write(cr, uid, [uid], {'email': 'a@a', 'notification_email_send': 'always'})
|
self.res_users.write(cr, uid, [uid], {'email': 'a@a', 'notify_email': 'always'})
|
||||||
self.res_users.write(cr, uid, [self.user_raoul_id], {'email': 'r@r'})
|
self.res_users.write(cr, uid, [self.user_raoul_id], {'email': 'r@r'})
|
||||||
# 1 - Bert Tartopoils, with email, should receive emails for comments and emails
|
# 1 - Bert Tartopoils, with email, should receive emails for comments and emails
|
||||||
p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
|
p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
|
||||||
# 2 - Carine Poilvache, with email, should receive emails for emails
|
# 2 - Carine Poilvache, with email, should receive emails for emails
|
||||||
p_c_id = self.res_partner.create(cr, uid, {'name': 'Carine Poilvache', 'email': 'c@c', 'notification_email_send': 'never'})
|
p_c_id = self.res_partner.create(cr, uid, {'name': 'Carine Poilvache', 'email': 'c@c', 'notify_email': 'none'})
|
||||||
# 3 - Dédé Grosbedon, without email, to test email verification; should receive emails for every message
|
# 3 - Dédé Grosbedon, without email, to test email verification; should receive emails for every message
|
||||||
p_d_id = self.res_partner.create(cr, uid, {'name': 'Dédé Grosbedon', 'email': 'd@d', 'notification_email_send': 'always'})
|
p_d_id = self.res_partner.create(cr, uid, {'name': 'Dédé Grosbedon', 'email': 'd@d', 'notify_email': 'always'})
|
||||||
# 4 - Attachments
|
# 4 - Attachments
|
||||||
attach1_id = self.ir_attachment.create(cr, user_raoul.id, {
|
attach1_id = self.ir_attachment.create(cr, user_raoul.id, {
|
||||||
'name': 'Attach1', 'datas_fname': 'Attach1',
|
'name': 'Attach1', 'datas_fname': 'Attach1',
|
||||||
|
@ -600,9 +600,9 @@ class test_mail(TestMail):
|
||||||
# 1 - Bert Tartopoils, with email, should receive emails for comments and emails
|
# 1 - Bert Tartopoils, with email, should receive emails for comments and emails
|
||||||
p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
|
p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
|
||||||
# 2 - Carine Poilvache, with email, should receive emails for emails
|
# 2 - Carine Poilvache, with email, should receive emails for emails
|
||||||
p_c_id = self.res_partner.create(cr, uid, {'name': 'Carine Poilvache', 'email': 'c@c', 'notification_email_send': 'always'})
|
p_c_id = self.res_partner.create(cr, uid, {'name': 'Carine Poilvache', 'email': 'c@c', 'notify_email': 'always'})
|
||||||
# 3 - Dédé Grosbedon, without email, to test email verification; should receive emails for every message
|
# 3 - Dédé Grosbedon, without email, to test email verification; should receive emails for every message
|
||||||
p_d_id = self.res_partner.create(cr, uid, {'name': 'Dédé Grosbedon', 'email': 'd@d', 'notification_email_send': 'always'})
|
p_d_id = self.res_partner.create(cr, uid, {'name': 'Dédé Grosbedon', 'email': 'd@d', 'notify_email': 'always'})
|
||||||
# 4 - Create a Bird mail.group, that will be used to test mass mailing
|
# 4 - Create a Bird mail.group, that will be used to test mass mailing
|
||||||
group_bird_id = self.mail_group.create(cr, uid,
|
group_bird_id = self.mail_group.create(cr, uid,
|
||||||
{
|
{
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<field name="email">demo.portal@yourcompany.example.com</field>
|
<field name="email">demo.portal@yourcompany.example.com</field>
|
||||||
<field name="supplier" eval="False"/>
|
<field name="supplier" eval="False"/>
|
||||||
<field name="customer" eval="True"/>
|
<field name="customer" eval="True"/>
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
<field name="city">Vivegnis</field>
|
<field name="city">Vivegnis</field>
|
||||||
<field name="zip">4683</field>
|
<field name="zip">4683</field>
|
||||||
<field name="country_id" ref="base.be"/>
|
<field name="country_id" ref="base.be"/>
|
||||||
|
|
|
@ -234,15 +234,15 @@ Best Designers has now emerged serving the Small and Medium Business – SMB’s
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record id="base.res_partner_24" model="res.partner">
|
<record id="base.res_partner_24" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record id="base.res_partner_25" model="res.partner">
|
<record id="base.res_partner_25" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<record id="base.res_partner_26" model="res.partner">
|
<record id="base.res_partner_26" model="res.partner">
|
||||||
<field name="notification_email_send">never</field>
|
<field name="notify_email">none</field>
|
||||||
</record>
|
</record>
|
||||||
</data>
|
</data>
|
||||||
</openerp>
|
</openerp>
|
||||||
|
|
Loading…
Reference in New Issue