Merge pull request #54583 from frappe/version-16-hotfix

Author: diptanilsaha

.github/workflows/server-tests-mariadb.yml

@@ -41,6 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     env:
+      TZ: 'Asia/Kolkata'
       NODE_ENV: "production"
       WITH_COVERAGE: ${{ github.event_name != 'pull_request' }}
 
@@ -56,6 +57,7 @@ jobs:
       mysql:
         image: mariadb:10.6
         env:
+          TZ: 'Asia/Kolkata'
           MARIADB_ROOT_PASSWORD: 'root'
         ports:
           - 3306:3306

erpnext/accounts/doctype/account/account.js

@@ -5,8 +5,7 @@ frappe.ui.form.on("Account", {
 	setup: function (frm) {
 		frm.add_fetch("parent_account", "report_type", "report_type");
 		frm.add_fetch("parent_account", "root_type", "root_type");
-	},
-	onload: function (frm) {
+
 		frm.set_query("parent_account", function (doc) {
 			return {
 				filters: {
@@ -15,7 +14,18 @@ frappe.ui.form.on("Account", {
 				},
 			};
 		});
+
+		frm.set_query("account_category", function () {
+			if (!frm.doc.root_type) return;
+
+			return {
+				filters: {
+					root_type: ["in", [frm.doc.root_type, ""]],
+				},
+			};
+		});
 	},
+
 	refresh: function (frm) {
 		frm.toggle_display("account_name", frm.is_new());
 
@@ -58,12 +68,20 @@ frappe.ui.form.on("Account", {
 			}
 		}
 	},
+
 	account_type: function (frm) {
 		if (frm.doc.is_group == 0) {
 			frm.toggle_display(["tax_rate"], frm.doc.account_type == "Tax");
 			frm.toggle_display("warehouse", frm.doc.account_type == "Stock");
 		}
 	},
+
+	root_type: function (frm) {
+		if (frm.doc.account_category) {
+			frm.set_value("account_category", "");
+		}
+	},
+
 	add_toolbar_buttons: function (frm) {
 		frm.add_custom_button(
 			__("Chart of Accounts"),

erpnext/accounts/doctype/account_category/account_category.json

@@ -7,13 +7,16 @@
  "engine": "InnoDB",
  "field_order": [
   "account_category_name",
+  "root_type",
+  "column_break_qluu",
   "description"
  ],
  "fields": [
   {
    "fieldname": "account_category_name",
    "fieldtype": "Data",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Account Category Name",
    "reqd": 1,
    "unique": 1
@@ -22,6 +25,18 @@
    "fieldname": "description",
    "fieldtype": "Small Text",
    "label": "Description"
+  },
+  {
+   "fieldname": "column_break_qluu",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "root_type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Root Type",
+   "options": "\nAsset\nLiability\nIncome\nExpense\nEquity"
   }
  ],
  "grid_page_length": 50,
@@ -32,7 +47,7 @@
    "link_fieldname": "account_category"
   }
  ],
- "modified": "2026-02-23 01:19:49.589393",
+ "modified": "2026-03-05 06:49:34.430723",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account Category",
@@ -69,7 +84,7 @@
   }
  ],
  "row_format": "Dynamic",
- "search_fields": "account_category_name, description",
+ "search_fields": "account_category_name, root_type",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": []

erpnext/accounts/doctype/account_category/account_category.py

@@ -21,6 +21,7 @@ class AccountCategory(Document):
 
 		account_category_name: DF.Data
 		description: DF.SmallText | None
+		root_type: DF.Literal["", "Asset", "Liability", "Income", "Expense", "Equity"]
 	# end: auto-generated types
 
 	def after_rename(self, old_name, new_name, merge):

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",

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -77,6 +77,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_payment_schedule_in_payment_request: DF.Check
 		fetch_valuation_rate_for_internal_transaction: DF.Check
@@ -142,6 +143,10 @@ def validate(self):
 			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()
 
@@ -234,6 +239,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,