From 3f45e782b7738502f2e83eedc79aa7a14f1784e1 Mon Sep 17 00:00:00 2001 From: Patrick Hoste Date: Tue, 14 Jan 2020 08:56:43 +0000 Subject: [PATCH] [IMP] (mass_mailing_)event(_sms): adds send invitation button on event form PURPOSE Integrate the mass_mailing feature to event in order to send an invitation to the event you organized. Task ID : 2093336 PR : #43420 --- addons/event/models/event_event.py | 2 +- addons/mass_mailing_event/models/event.py | 35 ++++++++++++------- .../mass_mailing_event/views/event_views.xml | 7 +++- addons/mass_mailing_event_sms/models/event.py | 6 ++++ 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/addons/event/models/event_event.py b/addons/event/models/event_event.py index 2e78da33d97..df2ff09af0d 100644 --- a/addons/event/models/event_event.py +++ b/addons/event/models/event_event.py @@ -220,7 +220,7 @@ class EventEvent(models.Model): @api.depends('date_end', 'seats_available', 'seats_availability', 'event_ticket_ids.sale_available') def _compute_event_registrations_open(self): for event in self: - event.event_registrations_open = (event.date_end > fields.Datetime.now()) and \ + event.event_registrations_open = event.date_end and (event.date_end > fields.Datetime.now()) and \ (event.seats_available or event.seats_availability == 'unlimited') and \ (not event.event_ticket_ids or any(ticket.sale_available for ticket in event.event_ticket_ids)) diff --git a/addons/mass_mailing_event/models/event.py b/addons/mass_mailing_event/models/event.py index 88def04d85f..648a900795b 100644 --- a/addons/mass_mailing_event/models/event.py +++ b/addons/mass_mailing_event/models/event.py @@ -1,22 +1,31 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import models +from odoo import models, _ class Event(models.Model): _inherit = "event.event" def action_mass_mailing_attendees(self): - mass_mailing_action = dict( - name='Mass Mail Attendees', - type='ir.actions.act_window', - res_model='mailing.mailing', - view_mode='form', - target='current', - context=dict( - default_mailing_model_id=self.env.ref('event.model_event_registration').id, - default_mailing_domain=repr([('event_id', 'in', self.ids)]) - ), - ) - return mass_mailing_action + return { + 'name': 'Mass Mail Attendees', + 'type': 'ir.actions.act_window', + 'res_model': 'mailing.mailing', + 'view_mode': 'form', + 'target': 'current', + 'context': { + 'default_mailing_model_id': self.env.ref('event.model_event_registration').id, + 'default_mailing_domain': repr([('event_id', 'in', self.ids)]) + }, + } + + def action_invite_contacts(self): + return { + 'name': 'Mass Mail Invitation', + 'type': 'ir.actions.act_window', + 'res_model': 'mailing.mailing', + 'view_mode': 'form', + 'target': 'current', + 'context': {'default_mailing_model_id': self.env.ref('base.model_res_partner').id}, + } diff --git a/addons/mass_mailing_event/views/event_views.xml b/addons/mass_mailing_event/views/event_views.xml index 86b870f706a..0a24375fe1f 100644 --- a/addons/mass_mailing_event/views/event_views.xml +++ b/addons/mass_mailing_event/views/event_views.xml @@ -3,10 +3,15 @@ event.event.view.form.inherit.mass.mailing event.event - + + +