diff --git a/erpnext/accounts/doctype/subscription/subscription.json b/erpnext/accounts/doctype/subscription/subscription.json index fc7ed85edf258ec369f5e0a2bb7ccf918a8f93fb..14d93ac193968ad8955da9a7909c93b991cb2fd9 100644 --- a/erpnext/accounts/doctype/subscription/subscription.json +++ b/erpnext/accounts/doctype/subscription/subscription.json @@ -56,6 +56,7 @@ "mode_of_payment", "email_template", "print_format", + "no_automatic_payment", "column_break_wwir", "venue_management_tab", "booking_credits_section", @@ -389,11 +390,17 @@ "fieldname": "order_generation_days_before_period", "fieldtype": "Int", "label": "Generate order x days before posting date" + }, + { + "default": "0", + "fieldname": "no_automatic_payment", + "fieldtype": "Check", + "label": "Do not process payment automatically" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-01-17 18:20:38.132890", + "modified": "2024-04-30 18:31:23.372542", "modified_by": "Administrator", "module": "Accounts", "name": "Subscription", diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py index 3f4a2d0bf86bdcd8914cbb907d73bfd8b40eaf51..75d8180a38f08ea98555fa066bf7f6a437c7471c 100644 --- a/erpnext/accounts/doctype/subscription/subscription.py +++ b/erpnext/accounts/doctype/subscription/subscription.py @@ -60,11 +60,12 @@ class Subscription(Document): email_template: DF.Link | None generate_invoice_at_period_start: DF.Check generate_invoice_before_payment: DF.Check - order_generation_days_before_period: DF.Int grand_total: DF.Currency invoicing_day: DF.Int mode_of_payment: DF.Link | None naming_series: DF.Literal["ACC-SUB-.YYYY.-.#####"] + no_automatic_payment: DF.Check + order_generation_days_before_period: DF.Int outstanding_amount: DF.Currency plans: DF.Table[SubscriptionPlanDetail] print_format: DF.Link | None diff --git a/erpnext/accounts/doctype/subscription/subscription_transaction.py b/erpnext/accounts/doctype/subscription/subscription_transaction.py index f48ab3da3bcdc0081442085d4c193f3c085cf87b..74847ba87207270676bf537dd407afcba347dda4 100644 --- a/erpnext/accounts/doctype/subscription/subscription_transaction.py +++ b/erpnext/accounts/doctype/subscription/subscription_transaction.py @@ -341,6 +341,7 @@ class SubscriptionPaymentRequestGenerator: if ( not frappe.conf.mute_payment_gateways + and not self.subscription.no_automatic_payment and float(payment_request.get("grand_total")) > 0 and payment_request_document.check_if_immediate_payment_is_autorized() ):