From bd521d908991dd83f7a00b72708a95ec39c61219 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Sun, 8 Feb 2026 20:36:24 +0530
Subject: [PATCH] refactor: supplier form cleanup

---
 erpnext/buying/doctype/supplier/supplier.js   | 14 +++---
 erpnext/buying/doctype/supplier/supplier.json | 47 ++++++++++++-------
 erpnext/buying/doctype/supplier/supplier.py   |  2 -
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index fb4ef867ade..3f5d8dbca04 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -73,6 +73,12 @@ frappe.ui.form.on("Supplier", {
 		};
 	},
 
+	supplier_group(frm) {
+		if (frm.doc.supplier_group) {
+			frm.trigger("get_supplier_group_details");
+		}
+	},
+
 	refresh: function (frm) {
 		if (frappe.defaults.get_default("supp_master_name") != "Naming Series") {
 			frm.toggle_display("naming_series", false);
@@ -111,14 +117,6 @@ frappe.ui.form.on("Supplier", {
 				__("View")
 			);
 
-			frm.add_custom_button(
-				__("Get Supplier Group Details"),
-				function () {
-					frm.trigger("get_supplier_group_details");
-				},
-				__("Actions")
-			);
-
 			if (
 				cint(frappe.defaults.get_default("enable_common_party_accounting")) &&
 				frappe.model.can_create("Party Link")
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 2e8260a7785..08178831751 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -11,8 +11,8 @@
  "engine": "InnoDB",
  "field_order": [
   "naming_series",
-  "supplier_name",
   "supplier_type",
+  "supplier_name",
   "gender",
   "column_break0",
   "supplier_group",
@@ -24,24 +24,12 @@
   "default_bank_account",
   "column_break_10",
   "default_price_list",
-  "internal_supplier_section",
-  "is_internal_supplier",
-  "represents_company",
-  "column_break_16",
-  "companies",
   "column_break2",
   "supplier_details",
   "column_break_30",
   "website",
   "language",
   "customer_numbers",
-  "dashboard_tab",
-  "tax_tab",
-  "tax_id",
-  "tax_category",
-  "column_break_27",
-  "tax_withholding_category",
-  "tax_withholding_group",
   "contact_and_address_tab",
   "address_contacts",
   "address_html",
@@ -55,19 +43,32 @@
   "supplier_primary_contact",
   "mobile_no",
   "email_id",
+  "tax_tab",
+  "tax_id",
+  "tax_category",
+  "column_break_27",
+  "tax_withholding_category",
+  "tax_withholding_group",
   "accounting_tab",
   "payment_terms",
   "default_accounts_section",
   "accounts",
+  "internal_supplier_section",
+  "is_internal_supplier",
+  "represents_company",
+  "column_break_16",
+  "companies",
   "settings_tab",
   "allow_purchase_invoice_creation_without_purchase_order",
   "allow_purchase_invoice_creation_without_purchase_receipt",
   "column_break_54",
   "disabled",
   "is_frozen",
+  "rfq_and_purchase_order_settings_section",
   "warn_rfqs",
-  "warn_pos",
   "prevent_rfqs",
+  "column_break_oxjw",
+  "warn_pos",
   "prevent_pos",
   "block_supplier_section",
   "on_hold",
@@ -75,7 +76,8 @@
   "column_break_59",
   "release_date",
   "portal_users_tab",
-  "portal_users"
+  "portal_users",
+  "dashboard_tab"
  ],
  "fields": [
   {
@@ -398,7 +400,7 @@
   {
    "fieldname": "dashboard_tab",
    "fieldtype": "Tab Break",
-   "label": "Dashboard",
+   "label": "Connections",
    "show_dashboard": 1
   },
   {
@@ -430,7 +432,7 @@
    "collapsible": 1,
    "fieldname": "internal_supplier_section",
    "fieldtype": "Section Break",
-   "label": "Internal Supplier"
+   "label": "Internal Supplier Accounting"
   },
   {
    "fieldname": "column_break_16",
@@ -491,6 +493,15 @@
    "fieldtype": "Link",
    "label": "Gender",
    "options": "Gender"
+  },
+  {
+   "fieldname": "rfq_and_purchase_order_settings_section",
+   "fieldtype": "Section Break",
+   "label": "RFQ and Purchase Order Settings"
+  },
+  {
+   "fieldname": "column_break_oxjw",
+   "fieldtype": "Column Break"
   }
  ],
  "grid_page_length": 50,
@@ -504,7 +515,7 @@
    "link_fieldname": "party"
   }
  ],
- "modified": "2026-02-06 12:58:01.398824",
+ "modified": "2026-02-08 20:28:01.101808",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier",
diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
index 3146246fc1c..6a7332411d0 100644
--- a/erpnext/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py
@@ -162,8 +162,6 @@ class Supplier(TransactionBase):
 		if doc.payment_terms:
 			self.payment_terms = doc.payment_terms
 
-		self.save()
-
 	def validate_internal_supplier(self):
 		if not self.is_internal_supplier:
 			self.represents_company = ""