diff --git a/__manifest__.py b/__manifest__.py
index 35ec4eb..43a82b4 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -64,7 +64,7 @@
'views/webclient_templates.xml',
'views/auth_signup_login_templates.xml',
'views/website_templates.xml',
- 'views/payment_views.xml'
+ #'views/payment_views.xml'
],
diff --git a/controllers/kalachakra.py b/controllers/kalachakra.py
index d2c18ba..efb08b8 100644
--- a/controllers/kalachakra.py
+++ b/controllers/kalachakra.py
@@ -153,6 +153,18 @@ class kalachakra_event(WebsiteEventController,PaymentProcessing):
tags = request.env['event.tag'].search([('name', '=', searches['tags'])])
return tags
+
+
+ @http.route(['/notre-centre-de-retraite/presentation-du-centre'], type='http', auth='public', website=True, sitemap=False,csrf=False)
+ def kalachakracentreretraite(self,**post):
+
+ return http.request.redirect('/saint-cosme')
+
+ @http.route(['/calendrier'], type='http', auth='public', website=True, sitemap=False,csrf=False)
+ def kalachakcalendrier(self,**post):
+
+ return http.request.redirect('/event')
+
@http.route(['/event/calendar'], type='http', auth='public', website=True, sitemap=False,csrf=False)
def eventCalendar(self,**post):
url='https://calendar.google.com/calendar/embed?height=600&wkst=2&bgcolor=%23ffffff&ctz=Europe%2FParis&mode=WEEK&src=aXRrYWxhY2hha3JhQGdtYWlsLmNvbQ&src=bjYxODA1OXQ2dmRwNmp0Y3Foa3FjMTMwdWtAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ&src=MnJzc2VvY3MzcGNiaDliaGFvNXZ1a3JpM3NAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ&src=cGJ0YjBtbTBja2NsMDZmdTNvb2ViMDJpOXNAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ&src=ZnIuZnJlbmNoI2hvbGlkYXlAZ3JvdXAudi5jYWxlbmRhci5nb29nbGUuY29t&color=%23039BE5&color=%238E24AA&color=%23E4C441&color=%237CB342&color=%230B8043" style="border:solid 1px #777" width="800" height="600" frameborder="0" scrolling="no"'
diff --git a/models/booking_event_registration.py b/models/booking_event_registration.py
index 23ad406..87f8c30 100644
--- a/models/booking_event_registration.py
+++ b/models/booking_event_registration.py
@@ -105,7 +105,7 @@ class EventRegistration(models.Model):
rec.to_be_paid_amount=0
if rec.invoice_id : rec.to_be_paid_amount=rec.invoice_id.amount_residual
else:
- if rec.down_payment_invoice_id and balance_invoice_id:
+ if rec.down_payment_invoice_id and rec.balance_invoice_id:
rec.to_be_paid_amount=rec.down_payment_invoice_id.amount_residual+rec.balance_invoice_id.amount_residual
def _compute_payment_status(self):
@@ -117,12 +117,12 @@ class EventRegistration(models.Model):
else:
- if rec.down_payment_invoice_id and balance_invoice_id:
+ if rec.down_payment_invoice_id and rec.balance_invoice_id:
if rec.down_payment_invoice_state!='paid':rec.payment_status='down payment not paid'
- if rec.down_payment_invoice_state=='paid' and rec.balance_payment_invoice_state=='paid' :rec.payment_status='paid'
- if rec.down_payment_invoice_state=='paid' and rec.balance_payment_invoice_state!='paid':rec.payment_status='down payment paid'
+ if rec.down_payment_invoice_state=='paid' and rec.balance_invoice_state=='paid' :rec.payment_status='paid'
+ if rec.down_payment_invoice_state=='paid' and rec.balance_invoice_state!='paid':rec.payment_status='down payment paid'
- if rec.payment_status=='paid':
+ if rec.payment_status in('paid','down payment paid'):
rec.state='open'
else:
rec.state='draft'
diff --git a/models/membership.py b/models/membership.py
index 4973983..3e7fbaf 100644
--- a/models/membership.py
+++ b/models/membership.py
@@ -27,14 +27,20 @@ class kalachakra_membership(models.Model):
def _compute_payment_state(self):
for rec in self:
- rec.payment_state='not paid'
+
#adhesion via page d'ahésion
if rec.state=='done':rec.payment_state='paid'
#adhésion via isncription à l'événement
- if rec.invoice_id:
+ elif rec.invoice_id:
if rec.invoice_id.payment_state=='paid':
+ #raise Warning(rec.invoice_id.payment_state)
rec.payment_state='paid'
rec.state='done'
+ else:rec.payment_state='not paid'
+
+ else:
+ rec.payment_state='not paid'
+
@@ -145,7 +151,6 @@ class kalachakra_membership(models.Model):
else:
member_status='not member'
- #partner=self.env['res.partner'].search([('id','=',int(self.partner_id))])
if self.partner_id.super_member==False:
self.partner_id.member_status=member_status
diff --git a/views/booking_website_registration.xml b/views/booking_website_registration.xml
index e78a408..191f738 100644
--- a/views/booking_website_registration.xml
+++ b/views/booking_website_registration.xml
@@ -218,7 +218,7 @@
Medical concern
*
-