Merge pull request #53074 from Jatin3128/subscription-section-hide

feat: add setting to hide Subscription references across doctypes
2026-04-12 03:15:07 +00:00 · 2026-03-27 10:37:59 +05:30
parent 6566acbe23 226aafa8cf
commit c283c1c472
15 changed files with 103 additions and 67 deletions
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -16,6 +16,7 @@
  "invoicing_features_section",
  "check_supplier_invoice_uniqueness",
  "automatically_fetch_payment_terms",
+  "enable_subscription",
  "column_break_17",
  "enable_common_party_accounting",
  "allow_multi_currency_invoices_against_single_party_account",
@@ -688,6 +689,13 @@
   "fieldname": "enable_accounting_dimensions",
   "fieldtype": "Check",
   "label": "Enable Accounting Dimensions"
+  },
+  {
+   "default": "1",
+   "description": "Enable Subscription tracking in invoice",
+   "fieldname": "enable_subscription",
+   "fieldtype": "Check",
+   "label": "Enable Subscription"
  }
 ],
 "grid_page_length": 50,
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py
@@ -72,6 +72,7 @@ class AccountsSettings(Document):
 		enable_immutable_ledger: DF.Check
 		enable_loyalty_point_program: DF.Check
 		enable_party_matching: DF.Check
+		enable_subscription: DF.Check
 		exchange_gain_loss_posting_date: DF.Literal["Invoice", "Payment", "Reconciliation Date"]
 		fetch_valuation_rate_for_internal_transaction: DF.Check
 		general_ledger_remarks_length: DF.Int
@@ -135,6 +136,10 @@ class AccountsSettings(Document):
 			toggle_loyalty_point_program_section(not self.enable_loyalty_point_program)
 			clear_cache = True

+		if old_doc.enable_subscription != self.enable_subscription:
+			toggle_subscription_sections(not self.enable_subscription)
+			clear_cache = True
+
 		if clear_cache:
 			frappe.clear_cache()

@@ -215,6 +220,12 @@ def toggle_loyalty_point_program_section(hide):
 			create_property_setter_for_hiding_field(doctype, "loyalty_points_redemption", hide)


+def toggle_subscription_sections(hide):
+	subscription_doctypes = frappe.get_hooks("subscription_doctypes")
+	for doctype in subscription_doctypes:
+		create_property_setter_for_hiding_field(doctype, "subscription_section", hide)
+
+
 def create_property_setter_for_hiding_field(doctype, field_name, hide):
 	make_property_setter(
 		doctype,
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -39,7 +39,7 @@
  "clearance_date",
  "column_break_oizh",
  "user_remark",
-  "subscription_section",
+  "auto_repeat_section",
  "auto_repeat",
  "tax_withholding_tab",
  "section_tax_withholding_entry",
@@ -475,11 +475,6 @@
   "options": "Stock Entry",
   "read_only": 1
  },
-  {
-   "fieldname": "subscription_section",
-   "fieldtype": "Section Break",
-   "label": "Subscription"
-  },
  {
   "allow_on_submit": 1,
   "fieldname": "auto_repeat",
@@ -651,6 +646,11 @@
   "fieldname": "tax_withholding_tab",
   "fieldtype": "Tab Break",
   "label": "Tax Withholding"
+  },
+  {
+   "fieldname": "auto_repeat_section",
+   "fieldtype": "Section Break",
+   "label": "Auto Repeat"
  }
 ],
 "icon": "fa fa-file-text",
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -89,6 +89,7 @@
  "remarks",
  "base_in_words",
  "is_opening",
+  "title",
  "column_break_16",
  "letter_head",
  "print_heading",
@@ -96,10 +97,9 @@
  "bank_account_no",
  "payment_order",
  "in_words",
-  "subscription_section",
-  "auto_repeat",
  "amended_from",
-  "title"
+  "auto_repeat_section",
+  "auto_repeat"
 ],
 "fields": [
  {
@@ -503,11 +503,6 @@
   "print_hide": 1,
   "read_only": 1
  },
-  {
-   "fieldname": "subscription_section",
-   "fieldtype": "Section Break",
-   "label": "Subscription Section"
-  },
  {
   "allow_on_submit": 1,
   "fieldname": "auto_repeat",
@@ -781,6 +776,11 @@
   "fieldname": "override_tax_withholding_entries",
   "fieldtype": "Check",
   "label": "Edit Tax Withholding Entries"
+  },
+  {
+   "fieldname": "auto_repeat_section",
+   "fieldtype": "Section Break",
+   "label": "Auto Repeat"
  }
 ],
 "grid_page_length": 50,
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -183,7 +183,7 @@
   "depends_on": "eval:doc.is_a_subscription",
   "fieldname": "subscription_section",
   "fieldtype": "Section Break",
-   "label": "Subscription Section"
+   "label": "Subscription"
  },
  {
   "fieldname": "subscription_plans",
@@ -478,7 +478,7 @@
 "index_web_pages_for_search": 1,
 "is_submittable": 1,
 "links": [],
- "modified": "2026-01-13 12:53:00.963274",
+ "modified": "2026-02-27 19:11:03.308896",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Payment Request",
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -102,8 +102,8 @@ class PaymentRequest(Document):
 		subscription_plans: DF.Table[SubscriptionPlanDetail]
 		swift_number: DF.ReadOnly | None
 		transaction_date: DF.Date | None
-
 	# end: auto-generated types
+
 	def on_discard(self):
 		self.db_set("status", "Cancelled")

--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
@@ -187,7 +187,7 @@
  "subscription_section",
  "from_date",
  "to_date",
-  "column_break_140",
+  "auto_repeat_section",
  "auto_repeat",
  "update_auto_repeat_reference",
  "against_income_account"
@@ -1462,7 +1462,7 @@
  {
   "fieldname": "subscription_section",
   "fieldtype": "Section Break",
-   "label": "Subscription Section"
+   "label": "Subscription"
  },
  {
   "allow_on_submit": 1,
@@ -1480,10 +1480,6 @@
   "no_copy": 1,
   "print_hide": 1
  },
-  {
-   "fieldname": "column_break_140",
-   "fieldtype": "Column Break"
-  },
  {
   "allow_on_submit": 1,
   "fieldname": "auto_repeat",
@@ -1619,12 +1615,17 @@
  {
   "fieldname": "column_break_bhao",
   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "auto_repeat_section",
+   "fieldtype": "Section Break",
+   "label": "Auto Repeat"
  }
 ],
 "icon": "fa fa-file-text",
 "is_submittable": 1,
 "links": [],
- "modified": "2026-02-10 14:23:07.181782",
+ "modified": "2026-03-02 07:32:47.667810",
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "POS Invoice",
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -180,11 +180,12 @@
  "unrealized_profit_loss_account",
  "subscription_section",
  "subscription",
-  "auto_repeat",
-  "update_auto_repeat_reference",
  "column_break_114",
  "from_date",
  "to_date",
+  "automation_section",
+  "auto_repeat",
+  "update_auto_repeat_reference",
  "printing_settings",
  "letter_head",
  "group_same_items",
@@ -1675,6 +1676,12 @@
   "fieldname": "totals_section",
   "fieldtype": "Section Break",
   "label": "Totals"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "automation_section",
+   "fieldtype": "Section Break",
+   "label": "Automation"
  }
 ],
 "grid_page_length": 50,
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -214,10 +214,11 @@
  "language",
  "subscription_section",
  "subscription",
-  "from_date",
-  "auto_repeat",
  "column_break_140",
+  "from_date",
  "to_date",
+  "automation_section",
+  "auto_repeat",
  "update_auto_repeat_reference",
  "utm_analytics_section",
  "utm_source",
@@ -2321,6 +2322,12 @@
  {
   "fieldname": "column_break_rdks",
   "fieldtype": "Column Break"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "automation_section",
+   "fieldtype": "Section Break",
+   "label": "Automation"
  }
 ],
 "grid_page_length": 50,
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -147,7 +147,7 @@
  "column_break_86",
  "select_print_heading",
  "language",
-  "subscription_section",
+  "auto_repeat_section",
  "from_date",
  "to_date",
  "column_break_97",
@@ -1013,12 +1013,6 @@
   "label": "Print Language",
   "print_hide": 1
  },
-  {
-   "collapsible": 1,
-   "fieldname": "subscription_section",
-   "fieldtype": "Section Break",
-   "label": "Auto Repeat"
-  },
  {
   "allow_on_submit": 1,
   "fieldname": "from_date",
@@ -1309,6 +1303,12 @@
   "fieldtype": "Time",
   "label": "Time",
   "mandatory_depends_on": "is_internal_supplier"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "auto_repeat_section",
+   "fieldtype": "Section Break",
+   "label": "Auto Repeat"
  }
 ],
 "grid_page_length": 50,
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -111,7 +111,7 @@
  "column_break_85",
  "select_print_heading",
  "language",
-  "subscription_section",
+  "auto_repeat_section",
  "auto_repeat",
  "update_auto_repeat_reference",
  "more_info",
@@ -736,11 +736,6 @@
   "print_hide": 1,
   "read_only": 1
  },
-  {
-   "fieldname": "subscription_section",
-   "fieldtype": "Section Break",
-   "label": "Auto Repeat"
-  },
  {
   "fieldname": "auto_repeat",
   "fieldtype": "Link",
@@ -940,6 +935,11 @@
   "no_copy": 1,
   "options": "Item Wise Tax Detail",
   "print_hide": 1
+  },
+  {
+   "fieldname": "auto_repeat_section",
+   "fieldtype": "Section Break",
+   "label": "Auto Repeat"
  }
 ],
 "grid_page_length": 50,
@@ -948,7 +948,7 @@
 "index_web_pages_for_search": 1,
 "is_submittable": 1,
 "links": [],
- "modified": "2026-01-29 21:23:13.778468",
+ "modified": "2026-02-27 18:05:50.121391",
 "modified_by": "Administrator",
 "module": "Buying",
 "name": "Supplier Quotation",
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -590,6 +590,8 @@ accounting_dimension_doctypes = [
 	"Advance Taxes and Charges",
 ]

+subscription_doctypes = ["Sales Invoice", "Purchase Invoice", "Payment Request", "POS Invoice"]
+
 get_matching_queries = (
 	"erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool.get_matching_queries"
 )
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -111,7 +111,7 @@
  "tc_name",
  "terms",
  "more_info_tab",
-  "subscription_section",
+  "auto_repeat_section",
  "auto_repeat",
  "update_auto_repeat_reference",
  "print_settings",
@@ -813,11 +813,6 @@
   "print_hide": 1,
   "read_only": 1
  },
-  {
-   "fieldname": "subscription_section",
-   "fieldtype": "Section Break",
-   "label": "Auto Repeat"
-  },
  {
   "fieldname": "auto_repeat",
   "fieldtype": "Link",
@@ -1130,6 +1125,11 @@
   "fieldname": "utm_analytics_section",
   "fieldtype": "Section Break",
   "label": "UTM Analytics"
+  },
+  {
+   "fieldname": "auto_repeat_section",
+   "fieldtype": "Section Break",
+   "label": "Auto Repeat"
  }
 ],
 "icon": "fa fa-shopping-cart",
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -151,7 +151,7 @@
  "loyalty_points",
  "column_break_116",
  "loyalty_amount",
-  "subscription_section",
+  "auto_repeat_section",
  "from_date",
  "to_date",
  "column_break_108",
@@ -1372,18 +1372,6 @@
   "options": "Sales Team",
   "print_hide": 1
  },
-  {
-   "allow_on_submit": 1,
-   "collapsible": 1,
-   "fieldname": "subscription_section",
-   "fieldtype": "Section Break",
-   "hide_days": 1,
-   "hide_seconds": 1,
-   "label": "Auto Repeat",
-   "no_copy": 1,
-   "print_hide": 1,
-   "read_only": 1
-  },
  {
   "allow_on_submit": 1,
   "fieldname": "from_date",
@@ -1742,6 +1730,18 @@
   "hidden": 1,
   "label": "Ignore Default Payment Terms Template",
   "read_only": 1
+  },
+  {
+   "allow_on_submit": 1,
+   "collapsible": 1,
+   "fieldname": "auto_repeat_section",
+   "fieldtype": "Section Break",
+   "hide_days": 1,
+   "hide_seconds": 1,
+   "label": "Auto Repeat",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
  }
 ],
 "grid_page_length": 50,
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -147,7 +147,7 @@
  "total_commission",
  "section_break1",
  "sales_team",
-  "subscription_section",
+  "auto_repeat_section",
  "auto_repeat",
  "printing_details",
  "letter_head",
@@ -1115,11 +1115,6 @@
   "oldfieldname": "instructions",
   "oldfieldtype": "Text"
  },
-  {
-   "fieldname": "subscription_section",
-   "fieldtype": "Section Break",
-   "label": "Subscription Section"
-  },
  {
   "fieldname": "auto_repeat",
   "fieldtype": "Link",
@@ -1450,6 +1445,11 @@
  {
   "fieldname": "column_break_ydwe",
   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "auto_repeat_section",
+   "fieldtype": "Section Break",
+   "label": "Auto Repeat"
  }
 ],
 "icon": "fa fa-truck",