From 8cd12e37cd19e455d20e22bbf892eecd51eaccfb Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 23 Feb 2026 11:26:31 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/buying/doctype/supplier/supplier.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json index c020779b3d7..94b3c8fe952 100644 --- a/erpnext/buying/doctype/supplier/supplier.json +++ b/erpnext/buying/doctype/supplier/supplier.json @@ -11,12 +11,12 @@ "engine": "InnoDB", "field_order": [ "naming_series", + "supplier_type", "supplier_name", "gender", "column_break0", "supplier_group", "country", - "supplier_type", "is_transporter", "image", "defaults_section",