diff --git a/odex25_sales/dev_membership/models/dev_membership.py b/odex25_sales/dev_membership/models/dev_membership.py index 30db53210..b4ca5c59c 100644 --- a/odex25_sales/dev_membership/models/dev_membership.py +++ b/odex25_sales/dev_membership/models/dev_membership.py @@ -143,11 +143,14 @@ class DevMembership(models.Model): if not self.invoice_id and not self.is_free: raise ValidationError(_('Please Create Membership Invoice')) if self.invoice_id.payment_state not in ['paid','in_payment'] and not self.is_free: - raise ValidationError(_('Membership Invoice is not paid.\nPlease Paid membership invoice and active the membership.')) + raise ValidationError(_('Membership Invoice is not paid.\nPlease pay the membership invoice and activate the membership.')) else: - self.invoice_id = self.invoice_id.payment_state + # Assuming you have a field to track payment state + self.payment_state = self.invoice_id.payment_state + self.state = 'active' self.partner_id.product_id = self.product_id.id + if not self.partner_id.join_date: self.partner_id.join_date = self.from_date if not self.partner_id.membrship_level: @@ -155,6 +158,7 @@ class DevMembership(models.Model): if not self.partner_id.memebership_end_date: self.partner_id.memebership_end_date = self.to_date + def action_cancel_membership(self): self.state = 'cancel'