|
@ -28,21 +28,23 @@ class kalachakra_membership(models.Model): |
|
|
invoice_id=fields.Many2one('account.move','invoice') |
|
|
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',store=True) |
|
|
payment_state=fields.Selection(string='payment_state',selection=[('paid', 'paid'), ('not paid', 'not paid')],compute='_compute_payment_state',store=True) |
|
|
|
|
|
|
|
|
|
|
|
@api.depends('state', 'invoice_id') |
|
|
def _compute_payment_state(self): |
|
|
def _compute_payment_state(self): |
|
|
for rec in self: |
|
|
for rec in self: |
|
|
|
|
|
|
|
|
|
|
|
rec.payment_state='not paid' |
|
|
#adhesion via page d'ahésion |
|
|
#adhesion via page d'ahésion |
|
|
if rec.state=='done':rec.payment_state='paid' |
|
|
if rec.state=='done':rec.payment_state='paid' |
|
|
|
|
|
if rec.state=='draft':rec.payment_state='not paid' |
|
|
#adhésion via isncription à l'événement |
|
|
#adhésion via isncription à l'événement |
|
|
elif rec.invoice_id: |
|
|
|
|
|
|
|
|
if rec.invoice_id: |
|
|
|
|
|
|
|
|
if rec.invoice_id.payment_state=='paid': |
|
|
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.payment_state='paid' |
|
|
rec.state='done' |
|
|
rec.state='done' |
|
|
else:rec.payment_state='not paid' |
|
|
else:rec.payment_state='not paid' |
|
|
|
|
|
|
|
|
else: |
|
|
|
|
|
rec.payment_state='not paid' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -149,11 +151,12 @@ class kalachakra_membership(models.Model): |
|
|
return transaction |
|
|
return transaction |
|
|
|
|
|
|
|
|
def update_membership(self): |
|
|
def update_membership(self): |
|
|
member=self.env['kalachakra.membership'].search([('partner_id','=', int(self.partner_id)),('end_date','>=',datetime.now()),('payment_state','=','paid')]) |
|
|
|
|
|
|
|
|
member=self.env['kalachakra.membership'].search([('partner_id','=', int(self.partner_id)),('end_date','>=',datetime.now()),('state','=','done')]) |
|
|
|
|
|
|
|
|
if member : self.partner_id.member_status='member' |
|
|
if member : self.partner_id.member_status='member' |
|
|
else :self.partner_id.member_status='not member' |
|
|
else :self.partner_id.member_status='not member' |
|
|
if self.partner_id.super_member: self.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': |
|
|
# if self.end_date>=datetime.now().date() and self.payment_state=='paid': |
|
|
# member_status='member' |
|
|
# member_status='member' |
|
|
# else: |
|
|
# else: |
|
|