Skip to content

Commit

Permalink
Merge pull request frappe#28187 from hrwX/subscription_active_fixes
Browse files Browse the repository at this point in the history
fix: do not generate multiple invoices
  • Loading branch information
nextchamp-saqib authored Nov 3, 2021
2 parents 11e90cc + 2bce193 commit a5902fa
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions erpnext/accounts/doctype/subscription/subscription.py
Original file line number Diff line number Diff line change
Expand Up @@ -502,9 +502,11 @@ def is_prepaid_to_invoice(self):
# Check invoice dates and make sure it doesn't have outstanding invoices
return getdate() >= getdate(self.current_invoice_start)

def is_current_invoice_generated(self):
def is_current_invoice_generated(self, _current_start_date=None, _current_end_date=None):
invoice = self.get_current_invoice()
_current_start_date, _current_end_date = self.update_subscription_period(date=add_days(self.current_invoice_end, 1), return_date=True)

if not (_current_start_date and _current_end_date):
_current_start_date, _current_end_date = self.update_subscription_period(date=add_days(self.current_invoice_end, 1), return_date=True)

if invoice and getdate(_current_start_date) <= getdate(invoice.posting_date) <= getdate(_current_end_date):
return True
Expand All @@ -523,7 +525,9 @@ def process_for_active(self):
if getdate() > getdate(self.current_invoice_end) and self.is_prepaid_to_invoice():
self.update_subscription_period(add_days(self.current_invoice_end, 1))

if not self.is_current_invoice_generated() and (self.is_postpaid_to_invoice() or self.is_prepaid_to_invoice()):
if not self.is_current_invoice_generated(self.current_invoice_start, self.current_invoice_end) \
and (self.is_postpaid_to_invoice() or self.is_prepaid_to_invoice()):

prorate = frappe.db.get_single_value('Subscription Settings', 'prorate')
self.generate_invoice(prorate)

Expand Down Expand Up @@ -559,14 +563,17 @@ def process_for_past_due_date(self):
else:
self.set_status_grace_period()

if getdate() > getdate(self.current_invoice_end):
self.update_subscription_period(add_days(self.current_invoice_end, 1))

# Generate invoices periodically even if current invoice are unpaid
if self.generate_new_invoices_past_due_date and not self.is_current_invoice_generated() and (self.is_postpaid_to_invoice()
or self.is_prepaid_to_invoice()):
if self.generate_new_invoices_past_due_date and not \
self.is_current_invoice_generated(self.current_invoice_start, self.current_invoice_end) \
and (self.is_postpaid_to_invoice() or self.is_prepaid_to_invoice()):

prorate = frappe.db.get_single_value('Subscription Settings', 'prorate')
self.generate_invoice(prorate)

if getdate() > getdate(self.current_invoice_end):
self.update_subscription_period(add_days(self.current_invoice_end, 1))

@staticmethod
def is_paid(invoice):
Expand Down

0 comments on commit a5902fa

Please sign in to comment.