diff --git a/models/event.py b/models/event.py
index 48a15a4..944df37 100644
--- a/models/event.py
+++ b/models/event.py
@@ -87,6 +87,7 @@ class KalachakraEvent(models.Model):
for child_event in child_events:
child_event.name=self.name
+ child_event.event_type_id=self.event_type_id
child_event.recurring_event_newsletter_id=self.recurring_event_newsletter_id
child_event.find_out_more_link=self.find_out_more_link
@@ -107,6 +108,7 @@ class KalachakraEvent(models.Model):
child_event.tag_ids=self.tag_ids
child_event.description=self.description
child_event.is_published=self.is_published
+ #child_event.event_mail_ids=self.event_mail_ids
@@ -118,11 +120,11 @@ class KalachakraEvent(models.Model):
def _compute_generated_events(self):
for rec in self:
rec.generated_events=False
- evt=rec.env['event.event'].search([('parent_event_id','=', int(rec.id))])
+ evt=rec.env['event.event'].search([('parent_event_id','=', rec.id)])
if evt:rec.generated_events=True
def remove_generated_events(self):
- evt=self.env['event.event'].search([('parent_event_id','=', int(self.id))])
+ evt=self.env['event.event'].search([('parent_event_id','=', self.id)])
if evt:
for e in evt:
if e.calendar_id and e.calendar_event_id:
@@ -175,6 +177,7 @@ class KalachakraEvent(models.Model):
vals['date_end']=end_date_event
vals['description']=rec.description
vals['tag_ids']=rec.tag_ids
+ vals['event_mail_ids']=rec.event_mail_ids
vals['event_logo']=rec.event_logo
vals['is_published']=True
vals['free_participation']=rec.free_participation
@@ -244,15 +247,79 @@ class KalachakraEvent(models.Model):
if prd.price_per=='night':
price=option.list_price*(self.duration-1)
- vals['event_id']=self.id
+ vals['event_id']=self._origin.id
vals['booking_option_id']=option.id
vals['booking_option_price']=price
vals['booking_option_member_price']=price
vals['booking_option_super_member_price']=price
vals['currency_id']=option.currency_id
self.booking_option_ids = [(0, 0, vals)]
+
+ #suppression des 2 templates de mail
+ # self.event_mail_ids=False
+ # self.env['event.mail'].sudo().search([('event_id','=',self._origin.id)]).unlink()
+
+ # template_mail_reg=self.env['mail.template'].sudo().search([('name','=','Retraite : Inscription')])
+ # #création du mail d'enregistrement
+ # if template_mail_reg:
+ # vals={}
+ # vals['display_name']=template_mail_reg.name
+ # vals['event_id']=self._origin.id
+ # vals['template_id']=template_mail_reg.id
+ # vals['interval_nbr']=0
+ # vals['interval_unit']='now'
+ # vals['interval_type']='after_sub'
+ # mail=self.env['event.mail'].sudo().create(vals)
+
+ # self.event_mail_ids=[(4, mail.id)]
+
+ # template_mail_remind=self.env['mail.template'].sudo().search([('name','=','Retraite : Rappel')])
+ # #création du mail avant événement
+ # if template_mail_remind:
+ # vals={}
+ # vals['display_name']=template_mail_remind.name
+ # vals['event_id']=self._origin.id
+ # vals['template_id']=int(template_mail_remind.id)
+ # vals['interval_nbr']=5
+ # vals['interval_unit']='days'
+ # vals['interval_type']='before_event'
+ # mail=self.env['event.mail'].sudo().create(vals)
+ # self.event_mail_ids=[(4, mail.id)]
+
-
+ # #événement
+ # else:
+
+ # #suppression des 2 templates de mail
+ # self.event_mail_ids=False
+ # self.env['event.mail'].sudo().search([('event_id','=',self._origin.id)]).unlink()
+
+ # template_mail_reg=self.env['mail.template'].sudo().search([('name','=','Evénement : Inscription')])
+ # #création du mail d'enregistrement
+ # if template_mail_reg:
+ # vals={}
+ # vals['display_name']=template_mail_reg.name
+ # vals['event_id']=self._origin.id
+ # vals['template_id']=template_mail_reg.id
+ # vals['interval_nbr']=0
+ # vals['interval_unit']='now'
+ # vals['interval_type']='after_sub'
+ # mail=self.env['event.mail'].sudo().create(vals)
+
+ # self.event_mail_ids=[(4, mail.id)]
+
+ # template_mail_remind=self.env['mail.template'].sudo().search([('name','=','Evénement : Rappel')])
+ # #création du mail avant événement
+ # if template_mail_remind:
+ # vals={}
+ # vals['display_name']=template_mail_remind.name
+ # vals['event_id']=self._origin.id
+ # vals['template_id']=int(template_mail_remind.id)
+ # vals['interval_nbr']=5
+ # vals['interval_unit']='days'
+ # vals['interval_type']='before_event'
+ # mail=self.env['event.mail'].sudo().create(vals)
+ # self.event_mail_ids=[(4, mail.id)]
diff --git a/views/event.xml b/views/event.xml
index 08bf507..1ff285b 100644
--- a/views/event.xml
+++ b/views/event.xml
@@ -14,6 +14,27 @@
+
+ event.view.tree.inherit.kalachakra
+ event.event
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
event.view.form.inherit.kalachakra