diff options
8 files changed, 15 insertions, 13 deletions
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml index 89459f4d434..5d144f639bf 100644 --- a/addons/crm/views/crm_lead_views.xml +++ b/addons/crm/views/crm_lead_views.xml @@ -134,11 +134,11 @@ <field name="phone_state" invisible="1"/> <label for="email_from" class="oe_inline"/> <div class="o_row o_row_readonly"> - <i class="fa fa-ban" style="color: red;" role="img" title="This email is blacklisted for mass mailing" + <i class="fa fa-ban" style="color: red;" role="img" title="This email is blacklisted for mass mailings" aria-label="Blacklisted" attrs="{'invisible': ['|', ('is_blacklisted', '=', False), ('partner_address_email', '!=', False)]}" groups="base.group_user"/> <field name="email_from" attrs="{'invisible': [('partner_address_email', '!=', False)]}" string="Email" widget="email"/> - <i class="fa fa-ban" style="color: red;" role="img" title="This email is blacklisted for mass mailing" + <i class="fa fa-ban" style="color: red;" role="img" title="This email is blacklisted for mass mailings" aria-label="Blacklisted" attrs="{'invisible': ['|', ('partner_is_blacklisted', '=', False), ('partner_address_email', '=', False)]}" groups="base.group_user"/> <field name="partner_address_email" attrs="{'invisible': [('partner_address_email', '=', False)]}" widget="email" string="Email"/> @@ -156,7 +156,7 @@ <field name="phone_state" invisible="1"/> <label for="email_from" class="oe_inline"/> <div class="o_row o_row_readonly"> - <i class="fa fa-ban" style="color: red;" role="img" title="This email is blacklisted for mass mailing" + <i class="fa fa-ban" style="color: red;" role="img" title="This email is blacklisted for mass mailings" aria-label="Blacklisted" attrs="{'invisible': [('is_blacklisted', '=', False)]}" groups="base.group_user"/> <field name="email_from" widget="email"/> </div> diff --git a/addons/mail/views/mail_blacklist_views.xml b/addons/mail/views/mail_blacklist_views.xml index b6e5f68a252..8ae6b2f3e7f 100644 --- a/addons/mail/views/mail_blacklist_views.xml +++ b/addons/mail/views/mail_blacklist_views.xml @@ -17,6 +17,7 @@ <field name="arch" type="xml"> <form string="Add Email Blacklist" duplicate="false" edit="false"> <sheet> + <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/> <group> <group> <field name="email"/> @@ -44,7 +45,7 @@ </record> <record id="mail_blacklist_action" model="ir.actions.act_window"> - <field name="name">Blacklist</field> + <field name="name">Blacklisted Email Addresses</field> <field name="res_model">mail.blacklist</field> <field name="view_id" ref="mail_blacklist_view_tree"/> <field name="search_view_id" ref="mail_blacklist_view_search"/> diff --git a/addons/mail/views/res_partner_views.xml b/addons/mail/views/res_partner_views.xml index 42c1d494bb7..98c93cd5a5b 100644 --- a/addons/mail/views/res_partner_views.xml +++ b/addons/mail/views/res_partner_views.xml @@ -11,7 +11,7 @@ <field name="is_blacklisted" invisible="1"/> <label for="email" class="oe_inline"/> <div class="o_row o_row_readonly"> - <i class="fa fa-ban" style="color: red;" role="img" title="This email is blacklisted for mass mailing" + <i class="fa fa-ban" style="color: red;" role="img" title="This email is blacklisted for mass mailings" aria-label="Blacklisted" attrs="{'invisible': [('is_blacklisted', '=', False)]}" groups="base.group_user"></i> <field name="email" widget="email"/> </div> diff --git a/addons/mass_mailing/views/mailing_contact_views.xml b/addons/mass_mailing/views/mailing_contact_views.xml index 2eaf2a36ab2..581694d74b1 100644 --- a/addons/mass_mailing/views/mailing_contact_views.xml +++ b/addons/mass_mailing/views/mailing_contact_views.xml @@ -13,7 +13,7 @@ <field name="is_blacklisted" invisible="1"/> <label for="contact_id" class="oe_inline"/> <div class="o_row o_row_readonly"> - <i class="fa fa-ban" style="color: red;" role="img" title="This email is blacklisted for mass mailing" + <i class="fa fa-ban" style="color: red;" role="img" title="This email is blacklisted for mass mailings" aria-label="Blacklisted" attrs="{'invisible': [('is_blacklisted', '=', False)]}" groups="base.group_user"></i> <field name="contact_id"/> </div> @@ -164,7 +164,7 @@ <group> <label for="email" class="oe_inline"/> <div class="o_row o_row_readonly" name="email_details"> - <i class="fa fa-ban" style="color: red;" role="img" title="This email is blacklisted for mass mailing" + <i class="fa fa-ban" style="color: red;" role="img" title="This email is blacklisted for mass mailings" aria-label="Blacklisted" attrs="{'invisible': [('is_blacklisted', '=', False)]}" groups="base.group_user"></i> <field name="email" widget="email"/> <field name="is_blacklisted" invisible="1"/> diff --git a/addons/mass_mailing/views/mailing_mailing_views_menus.xml b/addons/mass_mailing/views/mailing_mailing_views_menus.xml index 239f8271f5c..f6d3b69224c 100644 --- a/addons/mass_mailing/views/mailing_mailing_views_menus.xml +++ b/addons/mass_mailing/views/mailing_mailing_views_menus.xml @@ -12,7 +12,7 @@ groups="mass_mailing.group_mass_mailing_user"/> <!-- Configuration / Blacklist --> - <menuitem id="mail_blacklist_mm_menu" name="Blacklist" + <menuitem id="mail_blacklist_mm_menu" name="Blacklisted Email Addresses" action="mail.mail_blacklist_action" parent="mass_mailing_configuration"/> @@ -21,4 +21,4 @@ name="Mass Mailing" sequence="4" parent="base.menu_custom"/> -</odoo>
\ No newline at end of file +</odoo> diff --git a/addons/mass_mailing_sms/views/mailing_sms_menus.xml b/addons/mass_mailing_sms/views/mailing_sms_menus.xml index 8773241b880..1e505540b56 100644 --- a/addons/mass_mailing_sms/views/mailing_sms_menus.xml +++ b/addons/mass_mailing_sms/views/mailing_sms_menus.xml @@ -48,7 +48,7 @@ groups="mass_mailing.group_mass_mailing_user"/> <!-- SMS Marketing / Configuration / Blacklist --> <menuitem id="phone_blacklist_menu" - name="Phone Blacklist" + name="Blacklisted Phone Numbers" parent="mass_mailing_sms_menu_configuration" sequence="1" action="phone_validation.phone_blacklist_action" diff --git a/addons/phone_validation/models/mail_thread_phone.py b/addons/phone_validation/models/mail_thread_phone.py index f13161ad447..d0e9b5b9254 100644 --- a/addons/phone_validation/models/mail_thread_phone.py +++ b/addons/phone_validation/models/mail_thread_phone.py @@ -33,7 +33,7 @@ class PhoneMixin(models.AbstractModel): phone_blacklisted = fields.Boolean( string='Phone Blacklisted', compute="_compute_phone_blacklisted", compute_sudo=True, store=False, search="_search_phone_blacklisted", groups="base.group_user", - help="If the email address is on the blacklist, the contact won't receive mass mailing anymore, from any list") + help="If the phone number is on the blacklist, the contact won't receive mass mailing sms anymore, from any list") @api.depends(lambda self: self._phone_get_number_fields()) def _compute_phone_sanitized(self): diff --git a/addons/phone_validation/views/phone_blacklist_views.xml b/addons/phone_validation/views/phone_blacklist_views.xml index 7ed44da14b9..b04c7352e58 100644 --- a/addons/phone_validation/views/phone_blacklist_views.xml +++ b/addons/phone_validation/views/phone_blacklist_views.xml @@ -15,8 +15,9 @@ <field name="name">phone.blacklist.view.form</field> <field name="model">phone.blacklist</field> <field name="arch" type="xml"> - <form string="Phone Blacklist" duplicate="false"> + <form string="Phone Blacklist" duplicate="false" edit="false"> <sheet> + <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/> <group> <group> <field name="number"/> @@ -44,7 +45,7 @@ </record> <record id="phone_blacklist_action" model="ir.actions.act_window"> - <field name="name">Phone Blacklist</field> + <field name="name">Blacklisted Phone Numbers</field> <field name="res_model">phone.blacklist</field> <field name="view_id" ref="phone_blacklist_view_tree"/> <field name="search_view_id" ref="phone_blacklist_view_search"/> |