From a01ddcdc62661bc0a41b97147d37c931aa293a68 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Fri, 27 Jun 2025 13:53:49 +0200 Subject: [PATCH] fix: generate invoice when subscription is generated from sales order --- .../doctype/subscription/subscription_state_manager.py | 5 +++++ .../doctype/subscription/subscription_transaction.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/subscription/subscription_state_manager.py b/erpnext/accounts/doctype/subscription/subscription_state_manager.py index 4b9753de260..0992ccac888 100644 --- a/erpnext/accounts/doctype/subscription/subscription_state_manager.py +++ b/erpnext/accounts/doctype/subscription/subscription_state_manager.py @@ -233,6 +233,11 @@ class SubscriptionStateManager: if self.subscription_state.sales_order: if self.order_can_be_generated_before_period_start(): return True + if ( + not self.subscription_state.sales_invoice + and self.subscription.generate_invoice_before_payment + ): + return True return False if self.subscription.generate_invoice_at_period_start: diff --git a/erpnext/accounts/doctype/subscription/subscription_transaction.py b/erpnext/accounts/doctype/subscription/subscription_transaction.py index fec57003ab9..1c49cdc375c 100644 --- a/erpnext/accounts/doctype/subscription/subscription_transaction.py +++ b/erpnext/accounts/doctype/subscription/subscription_transaction.py @@ -338,7 +338,7 @@ class SubscriptionPaymentEntryGenerator(SubscriptionTransactionBase): ) if not bank_account_name: - frappe.thow(_("Please define a default company bank account")) + frappe.throw(_("Please define a default company bank account")) return frappe.get_doc("Bank Account", bank_account_name) -- GitLab