Merge pull request #45675 from frappe/mergify/bp/version-15-hotfix/pr…

…-45631 fix: Do not check for cancelled invoices (backport #45631)
frappe · Feb 3, 2025 · 16a80cc · 16a80cc
2 parents 0d94eba + 84638f5
commit 16a80cc
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py
@@ -634,9 +634,7 @@ def get_current_invoice(self) -> Document | None:
 		"""
 		invoice = frappe.get_all(
 			self.invoice_document_type,
-			{
-				"subscription": self.name,
-			},
+			{"subscription": self.name, "docstatus": ("<", 2)},
 			limit=1,
 			order_by="to_date desc",
 			pluck="name",
@@ -675,6 +673,7 @@ def has_outstanding_invoice(self) -> int:
 			self.invoice_document_type,
 			{
 				"subscription": self.name,
+				"docstatus": 1,
 				"status": ["!=", "Paid"],
 			},
 		)