diff options
Diffstat (limited to 'addons/mass_mailing/wizard')
| -rw-r--r-- | addons/mass_mailing/wizard/__init__.py | 2 | ||||
| -rw-r--r-- | addons/mass_mailing/wizard/mail_compose_message.py | 5 | ||||
| -rw-r--r-- | addons/mass_mailing/wizard/mailing_list_merge.py (renamed from addons/mass_mailing/wizard/mass_mailing_list_merge.py) | 8 | ||||
| -rw-r--r-- | addons/mass_mailing/wizard/mailing_list_merge_views.xml (renamed from addons/mass_mailing/wizard/mass_mailing_list_merge_views.xml) | 12 |
4 files changed, 13 insertions, 14 deletions
diff --git a/addons/mass_mailing/wizard/__init__.py b/addons/mass_mailing/wizard/__init__.py index d501dfb411a..e20c1b37026 100644 --- a/addons/mass_mailing/wizard/__init__.py +++ b/addons/mass_mailing/wizard/__init__.py @@ -3,5 +3,5 @@ from . import test_mailing from . import mail_compose_message -from . import mass_mailing_list_merge +from . import mailing_list_merge from . import mass_mailing_schedule_date diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py index fc75d7e192f..00cdfff0864 100644 --- a/addons/mass_mailing/wizard/mail_compose_message.py +++ b/addons/mass_mailing/wizard/mail_compose_message.py @@ -1,18 +1,17 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. + from odoo import api, fields, models, tools from odoo.tools import email_re class MailComposeMessage(models.TransientModel): - """Add concept of mass mailing campaign to the mail.compose.message wizard - """ _inherit = 'mail.compose.message' mass_mailing_campaign_id = fields.Many2one('mail.mass_mailing.campaign', string='Mass Mailing Campaign') mass_mailing_id = fields.Many2one('mail.mass_mailing', string='Mass Mailing', ondelete='cascade') mass_mailing_name = fields.Char(string='Mass Mailing Name') - mailing_list_ids = fields.Many2many('mail.mass_mailing.list', string='Mailing List') + mailing_list_ids = fields.Many2many('mailing.list', string='Mailing List') def get_mail_values(self, res_ids): """ Override method that generated the mail content by creating the diff --git a/addons/mass_mailing/wizard/mass_mailing_list_merge.py b/addons/mass_mailing/wizard/mailing_list_merge.py index 9a1a0f4409f..0ef97b12fa3 100644 --- a/addons/mass_mailing/wizard/mass_mailing_list_merge.py +++ b/addons/mass_mailing/wizard/mailing_list_merge.py @@ -5,11 +5,11 @@ from odoo import api, fields, models class MassMailingListMerge(models.TransientModel): - _name = 'mass.mailing.list.merge' + _name = 'mailing.list.merge' _description = 'Merge Mass Mailing List' - src_list_ids = fields.Many2many('mail.mass_mailing.list', string='Mailing Lists') - dest_list_id = fields.Many2one('mail.mass_mailing.list', string='Destination Mailing List') + src_list_ids = fields.Many2many('mailing.list', string='Mailing Lists') + dest_list_id = fields.Many2one('mailing.list', string='Destination Mailing List') merge_options = fields.Selection([ ('new', 'Merge into a new mailing list'), ('existing', 'Merge into an existing mailing list'), @@ -29,7 +29,7 @@ class MassMailingListMerge(models.TransientModel): def action_mailing_lists_merge(self): if self.merge_options == 'new': - self.dest_list_id = self.env['mail.mass_mailing.list'].create({ + self.dest_list_id = self.env['mailing.list'].create({ 'name': self.new_list_name, }).id self.dest_list_id.action_merge(self.src_list_ids, self.archive_src_lists) diff --git a/addons/mass_mailing/wizard/mass_mailing_list_merge_views.xml b/addons/mass_mailing/wizard/mailing_list_merge_views.xml index c1a1ebe3924..d5c9300483c 100644 --- a/addons/mass_mailing/wizard/mass_mailing_list_merge_views.xml +++ b/addons/mass_mailing/wizard/mailing_list_merge_views.xml @@ -1,9 +1,9 @@ <?xml version="1.0"?> <odoo> <!-- Merge Mailing List --> - <record id="mass_mailing_list_merge_view_form" model="ir.ui.view"> - <field name="name">mass.mailing.list.merge.form</field> - <field name="model">mass.mailing.list.merge</field> + <record id="mailing_list_merge_view_form" model="ir.ui.view"> + <field name="name">mailing.list.merge.form</field> + <field name="model">mailing.list.merge</field> <field name="arch" type="xml"> <form string="Merge Mass Mailing List"> <group> @@ -26,8 +26,8 @@ </field> </record> - <act_window id="mass_mailing_list_merge_action" name="Merge Selected Mailing Lists" - res_model="mass.mailing.list.merge" - binding_model="mail.mass_mailing.list" binding_views="list" + <act_window id="mailing_list_merge_action" name="Merge Selected Mailing Lists" + res_model="mailing.list.merge" + binding_model="mailing.list" binding_views="list" view_mode="form" target="new"/> </odoo> |