Browse Source

corrections

dev-rcn
root 3 years ago
parent
commit
e0027dc91c
3 changed files with 5 additions and 5 deletions
  1. +3
    -3
      models/membership.py
  2. +1
    -1
      models/partner.py
  3. +1
    -1
      views/event.xml

+ 3
- 3
models/membership.py View File

@ -26,7 +26,7 @@ class kalachakra_membership(models.Model):
product_id=fields.Many2one('product.product',required=True,string='membership product',default=_default_product_id,domain="[('membership_product','=',True)]")
start_date=fields.Date('start date',required=True,default=lambda self: fields.Date.today())
invoice_id=fields.Many2one('account.move','invoice')
payment_state=fields.Selection(string='payment_state',selection=[('paid', 'paid'), ('not paid', 'not paid')],compute='_compute_payment_state')
payment_state=fields.Selection(string='payment_state',selection=[('paid', 'paid'), ('not paid', 'not paid')],compute='_compute_payment_state',store=True)
def _compute_payment_state(self):
for rec in self:
@ -36,7 +36,7 @@ class kalachakra_membership(models.Model):
#adhésion via isncription à l'événement
elif rec.invoice_id:
if rec.invoice_id.payment_state=='paid':
raise Warning(rec.invoice_id.payment_state)
#raise Warning(rec.invoice_id.payment_state)
rec.payment_state='paid'
rec.state='done'
else:rec.payment_state='not paid'
@ -152,7 +152,7 @@ class kalachakra_membership(models.Model):
member=self.env['kalachakra.membership'].search([('partner_id','=', int(self.partner_id)),('end_date','>=',datetime.now()),('payment_state','=','paid')])
if member : self.partner_id.member_status='member'
else :self.partner_id.member_status='not member'
if self.partner_id.super_member: rec.member_status='super member'
if self.partner_id.super_member: self.member_status='super member'
# if self.end_date>=datetime.now().date() and self.payment_state=='paid':
# member_status='member'


+ 1
- 1
models/partner.py View File

@ -68,7 +68,7 @@ class ResPartner(models.Model):
if partner_mb:
rec.date_membership=partner_mb.end_date
date_membership=fields.Date(string='membership end date', compute='_compute_end_date_membership',translate=True)
date_membership=fields.Date(string='membership end date', compute='_compute_end_date_membership')
@api.depends('super_member')
def _compute_member_status(self):
for rec in self:


+ 1
- 1
views/event.xml View File

@ -60,7 +60,7 @@
<field name="name">Attendees</field>
<field name="view_mode">tree,kanban,form,calendar,graph</field>
<field name="domain">[('event_id', '=', active_id)]</field>
<field name="context">{'default_event_id': active_id,'booking_view':True}</field>
<field name="context">{'default_event_id': active_id,'booking_view':False}</field>
<field name="help" type="html">
<p class="o_view_nocontent_smiling_face">
Create an Attendee


Loading…
Cancel
Save