From b612ab582326e86f7e61f6034ff597d44d39d829 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Fri, 31 Jan 2025 11:44:51 +0530 Subject: [PATCH 1/2] fix: Do not check for cancelled invoices (cherry picked from commit 701fc02050058ee664b9ca0f28a1da6a73c70db8) --- erpnext/accounts/doctype/subscription/subscription.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py index 8cf08400490..162095d2acd 100644 --- a/erpnext/accounts/doctype/subscription/subscription.py +++ b/erpnext/accounts/doctype/subscription/subscription.py @@ -634,9 +634,7 @@ class Subscription(Document): """ 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", From 84638f58fd238e8ec420497b4f092e3904d5b729 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Fri, 31 Jan 2025 12:17:53 +0530 Subject: [PATCH 2/2] fix: Do not check for cancelled invoices (cherry picked from commit 2c94867b0e49384893a22a104109c299c5a3c1ff) --- erpnext/accounts/doctype/subscription/subscription.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py index 162095d2acd..7323c819d7e 100644 --- a/erpnext/accounts/doctype/subscription/subscription.py +++ b/erpnext/accounts/doctype/subscription/subscription.py @@ -673,6 +673,7 @@ class Subscription(Document): self.invoice_document_type, { "subscription": self.name, + "docstatus": 1, "status": ["!=", "Paid"], }, )