diff --git a/controllers/kalachakra.py b/controllers/kalachakra.py
index ff53694..79d441d 100644
--- a/controllers/kalachakra.py
+++ b/controllers/kalachakra.py
@@ -317,9 +317,9 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing):
request.session['kalachakra_transaction']='donation'
data['kalachakra_transaction']='donation'
data['title']='make donation'
- data['amount']=10
+ data['amount']=0
#donation product
- data['products']=request.env['product.product'].sudo().search([('donation','=',True)])
+ data['products']=request.env['product.product'].sudo().search([('donation','=',True),('booking_option_product','=',False)])
if type=='membership':
@@ -490,9 +490,9 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing):
data={}
if request.session['kalachakra_transaction']=='donation':
- data['submit_txt']='Donate now'
+ data['submit_txt']='Faire un don'
if request.session['kalachakra_transaction']=='membership':
- data['submit_txt']='Pay now'
+ data['submit_txt']='Régler maintenant'
data['success_url']='/kalachakra/payment/success'
data['error_url']='/kalachakra/payment/error'
diff --git a/models/event_registration.py b/models/event_registration.py
index cc2b94e..4fdaec5 100644
--- a/models/event_registration.py
+++ b/models/event_registration.py
@@ -56,7 +56,7 @@ class EventRegistration(models.Model):
else:
#si le contact existe, si la liste de diffusion n'est pas lié au contact, on l'ajoute
if not reg.event_id.recurring_event_newsletter_id in mailing_contact.list_ids:
- mailing_contact.sudo().write({'list_ids':[(4,int(event.recurring_event_newsletter_id))]})
+ mailing_contact.sudo().write({'list_ids':[(4,int(reg.event_id.recurring_event_newsletter_id))]})
#inscription à la newsletter générale
mailing_list=self.env['mailing.list'].sudo().search([('name','=','Newsletter '+self.env.company.name)])
diff --git a/views/mailing_list.xml b/views/mailing_list.xml
index afed7b5..f1f5482 100644
--- a/views/mailing_list.xml
+++ b/views/mailing_list.xml
@@ -15,6 +15,17 @@
-
@@ -214,6 +214,8 @@