devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dev_membership.py

This commit is contained in:
zainab2097 2024-08-13 16:47:50 +03:00 committed by GitHub
parent f5a383b36d
commit 67720f2cfa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
odex25_sales/dev_membership/models/dev_membership.py
View File

@ -84,7 +84,8 @@ class DevMembership(models.Model):
def _check_from_date(self): def _check_from_date(self):
for rec in self: for rec in self:
if not rec.from_date >= datetime.now().date(): if not rec.from_date >= datetime.now().date():
raise ValidationError("Membership date should be greater than or equal to today's date!!") pass
# raise ValidationError("Membership date should be greater than or equal to today's date!!")
def make_activity_group(self): def make_activity_group(self):
# templet_id = self.env.ref('dev_membership.template_membership_cancell') # templet_id = self.env.ref('dev_membership.template_membership_cancell')
@ -150,7 +151,12 @@ class DevMembership(models.Model):
self.state = 'active' self.state = 'active'
self.partner_id.product_id = self.product_id.id self.partner_id.product_id = self.product_id.id
# Handle sequence generation for new or renewed memberships
sequence_code = 'membership.no.sequence'
if not self.membership_id or self.state == 'cancel':
# Generate new sequence number if it's the first membership or it's a renewal after cancellation
self.partner_id.membrship_no = self.env['ir.sequence'].next_by_code(sequence_code) or _('New')
if not self.partner_id.join_date: if not self.partner_id.join_date:
self.partner_id.join_date = self.from_date self.partner_id.join_date = self.from_date
if not self.partner_id.membrship_level: if not self.partner_id.membrship_level:
@ -304,7 +310,7 @@ class DevMembership(models.Model):
# البحث عن مستوى العضوية بناءً على إجمالي الرسوم # البحث عن مستوى العضوية بناءً على إجمالي الرسوم
level_by_fees = self.env['membership.level'].search([ level_by_fees = self.env['membership.level'].search([
('min', '<=', total_fees), ('min', '<=', total_fees),
('max', '>=', total_fees),('years', '<=',total_duration) ('max', '>=', total_fees),('years', '>=',total_duration)
],order='sequence desc',limit=1) ],order='sequence desc',limit=1)
if level_by_fees : if level_by_fees :
record.membrship_level = level_by_fees record.membrship_level = level_by_fees