diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-01 18:20:28 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-01 18:20:28 +0100 |
| commit | e00a447e2ca277697bd3e3cae5196e8177d3e867 (patch) | |
| tree | c8580e47f101f75ceccd6ba19f9649b575f99177 /addons/event | |
| parent | cde120058aa4edd259b7d7e1624465af313710fe (diff) | |
| parent | 7e469eb77aae1f7e05a3ce0f6575b5149fed3ca1 (diff) | |
[MERGE] forward port branch saas-11.1 up to 7e469eb77aa
Diffstat (limited to 'addons/event')
| -rw-r--r-- | addons/event/i18n/zh_CN.po | 8 | ||||
| -rw-r--r-- | addons/event/models/event_mail.py | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po index d2a8ba8b759..b1bc9031981 100644 --- a/addons/event/i18n/zh_CN.po +++ b/addons/event/i18n/zh_CN.po @@ -3,10 +3,10 @@ # * event # # Translators: -# Jeffery CHEN <jeffery9@gmail.com>, 2016 +# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016 # 卓忆科技 <zhanghao@jointd.com>, 2016 # 老窦 北京 <2662059195@qq.com>, 2017 -# Martin Trigaux <mat@odoo.com>, 2017 +# Martin Trigaux, 2017 # Michael Chong <michaelchong2005@gmail.com>, 2017 # SHOM <shanmuxin@yeah.net>, 2017 # liAnGjiA <liangjia@qq.com>, 2017 @@ -748,7 +748,7 @@ msgstr "活动" #. module: event #: model:ir.model,name:event.model_event_mail msgid "Event Automated Mailing" -msgstr "" +msgstr "自动发邮件" #. module: event #: model:ir.actions.report,name:event.report_event_event_badge @@ -833,7 +833,7 @@ msgstr "活动类型" #: model:ir.cron,cron_name:event.event_mail_scheduler #: model:ir.cron,name:event.event_mail_scheduler msgid "Event: Mail Scheduler" -msgstr "" +msgstr "活动：邮件计划" #. module: event #: model:ir.actions.act_window,name:event.action_event_view diff --git a/addons/event/models/event_mail.py b/addons/event/models/event_mail.py index d87c24dd663..1013f5a083b 100644 --- a/addons/event/models/event_mail.py +++ b/addons/event/models/event_mail.py @@ -96,6 +96,7 @@ class EventMailScheduler(models.Model): @api.one def execute(self): + now = fields.Datetime.now() if self.interval_type == 'after_sub': # update registration lines lines = [ @@ -105,9 +106,10 @@ class EventMailScheduler(models.Model): if lines: self.write({'mail_registration_ids': lines}) # execute scheduler on registrations - self.mail_registration_ids.filtered(lambda reg: reg.scheduled_date and reg.scheduled_date <= datetime.strftime(fields.datetime.now(), tools.DEFAULT_SERVER_DATETIME_FORMAT)).execute() + self.mail_registration_ids.filtered(lambda reg: reg.scheduled_date and reg.scheduled_date <= now).execute() else: - if not self.mail_sent: + # Do not send emails if the mailing was scheduled before the event but the event is over + if not self.mail_sent and (self.interval_type != 'before_event' or self.event_id.date_end > now): self.event_id.mail_attendees(self.template_id.id) self.write({'mail_sent': True}) return True |