[FIX] Fix the call of the cron due to a function which has been renamed.
[IMP] Add param calendar.block_mail in ir.config.parameters to allow to bypass the sent of mails to attendees. bzr revid: jke@openerp.com-20140414202936-kh1izog183nwenb7
This commit is contained in:
parent
9c739f12c2
commit
b91bcbf0fc
|
@ -197,6 +197,10 @@ class calendar_attendee(osv.Model):
|
||||||
@param email_from: email address for user sending the mail
|
@param email_from: email address for user sending the mail
|
||||||
"""
|
"""
|
||||||
res = False
|
res = False
|
||||||
|
|
||||||
|
if self.pool['ir.config_parameter'].get_param(cr, uid, 'calendar.block_mail', default=False):
|
||||||
|
return res
|
||||||
|
|
||||||
mail_ids = []
|
mail_ids = []
|
||||||
data_pool = self.pool['ir.model.data']
|
data_pool = self.pool['ir.model.data']
|
||||||
mailmess_pool = self.pool['mail.message']
|
mailmess_pool = self.pool['mail.message']
|
||||||
|
@ -431,7 +435,7 @@ class calendar_alarm_manager(osv.AbstractModel):
|
||||||
if cron and len(cron) == 1:
|
if cron and len(cron) == 1:
|
||||||
cron = self.pool.get('ir.cron').browse(cr, uid, cron[0], context=context)
|
cron = self.pool.get('ir.cron').browse(cr, uid, cron[0], context=context)
|
||||||
else:
|
else:
|
||||||
raise ("Cron for " + self._name + " not identified :( !")
|
_logger.exception("Cron for " + self._name + " can not be identified !")
|
||||||
|
|
||||||
if cron.interval_type == "weeks":
|
if cron.interval_type == "weeks":
|
||||||
cron_interval = cron.interval_number * 7 * 24 * 60 * 60
|
cron_interval = cron.interval_number * 7 * 24 * 60 * 60
|
||||||
|
@ -445,7 +449,7 @@ class calendar_alarm_manager(osv.AbstractModel):
|
||||||
cron_interval = cron.interval_number
|
cron_interval = cron.interval_number
|
||||||
|
|
||||||
if not cron_interval:
|
if not cron_interval:
|
||||||
raise ("Cron delay for " + self._name + " can not be calculated :( !")
|
_logger.exception("Cron delay can not be computed !")
|
||||||
|
|
||||||
all_events = self.get_next_potential_limit_alarm(cr, uid, cron_interval, notif=False, context=context)
|
all_events = self.get_next_potential_limit_alarm(cr, uid, cron_interval, notif=False, context=context)
|
||||||
|
|
||||||
|
@ -649,7 +653,7 @@ class calendar_event(osv.Model):
|
||||||
_inherit = ["mail.thread", "ir.needaction_mixin"]
|
_inherit = ["mail.thread", "ir.needaction_mixin"]
|
||||||
|
|
||||||
def do_run_scheduler(self, cr, uid, id, context=None):
|
def do_run_scheduler(self, cr, uid, id, context=None):
|
||||||
self.pool['calendar.alarm_manager'].do_run_scheduler(cr, uid, context=context)
|
self.pool['calendar.alarm_manager'].get_next_mail(cr, uid, context=context)
|
||||||
|
|
||||||
def get_recurrent_date_by_event(self, cr, uid, event, context=None):
|
def get_recurrent_date_by_event(self, cr, uid, event, context=None):
|
||||||
"""Get recurrent dates based on Rule string and all event where recurrent_id is child
|
"""Get recurrent dates based on Rule string and all event where recurrent_id is child
|
||||||
|
|
Loading…
Reference in New Issue