From 0b42241682fedf5a452765c3599f5a857adc7d65 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Sat, 27 Jun 2026 16:13:43 +0530
Subject: [PATCH 1/3] fix: party aliases should be no copy

(cherry picked from commit 057af21cd8501aea6183d09d60324b0d6d562b82)

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/selling/doctype/customer/customer.json
---
 erpnext/buying/doctype/supplier/supplier.json  | 13 ++++++++++++-
 erpnext/selling/doctype/customer/customer.json | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index b747a64df43..a09e5041fd6 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -548,6 +548,17 @@
   {
    "fieldname": "section_break_pgad",
    "fieldtype": "Section Break"
+<<<<<<< HEAD
+=======
+  },
+  {
+   "fieldname": "alias",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Alias",
+   "no_copy": 1,
+   "unique": 1
+>>>>>>> 057af21cd8 (fix: party aliases should be no copy)
   }
  ],
  "grid_page_length": 50,
@@ -561,7 +572,7 @@
    "link_fieldname": "party"
   }
  ],
- "modified": "2026-06-22 12:23:09.241125",
+ "modified": "2026-06-27 16:12:33.190257",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier",
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 1cc2cde43c7..57e58b5d03f 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -682,6 +682,17 @@
   {
    "fieldname": "credit_limit_column",
    "fieldtype": "Column Break"
+<<<<<<< HEAD
+=======
+  },
+  {
+   "fieldname": "alias",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Alias",
+   "no_copy": 1,
+   "unique": 1
+>>>>>>> 057af21cd8 (fix: party aliases should be no copy)
   }
  ],
  "icon": "fa fa-user",
@@ -695,7 +706,7 @@
    "link_fieldname": "party"
   }
  ],
- "modified": "2026-06-22 12:23:19.196991",
+ "modified": "2026-06-27 16:12:10.457900",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Customer",

From e64e9866fb1699bcca005999e69ef6bb5bf292f3 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Sat, 27 Jun 2026 16:34:20 +0530
Subject: [PATCH 2/3] chore: fix conflicts

---
 erpnext/buying/doctype/supplier/supplier.json | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index a09e5041fd6..841a3ac780d 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -110,6 +110,7 @@
    "fieldtype": "Data",
    "in_global_search": 1,
    "label": "Alias",
+   "no_copy": 1,
    "unique": 1
   },
   {
@@ -548,17 +549,6 @@
   {
    "fieldname": "section_break_pgad",
    "fieldtype": "Section Break"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "alias",
-   "fieldtype": "Data",
-   "in_global_search": 1,
-   "label": "Alias",
-   "no_copy": 1,
-   "unique": 1
->>>>>>> 057af21cd8 (fix: party aliases should be no copy)
   }
  ],
  "grid_page_length": 50,

From b35c5c1568ce3fdda0dd6e2484016a0e9980c116 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Sat, 27 Jun 2026 16:34:53 +0530
Subject: [PATCH 3/3] chore: resolve conflicts

---
 erpnext/selling/doctype/customer/customer.json | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 57e58b5d03f..5556ab927b4 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -130,6 +130,7 @@
    "fieldtype": "Data",
    "in_global_search": 1,
    "label": "Alias",
+   "no_copy": 1,
    "unique": 1
   },
   {
@@ -682,17 +683,6 @@
   {
    "fieldname": "credit_limit_column",
    "fieldtype": "Column Break"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "alias",
-   "fieldtype": "Data",
-   "in_global_search": 1,
-   "label": "Alias",
-   "no_copy": 1,
-   "unique": 1
->>>>>>> 057af21cd8 (fix: party aliases should be no copy)
   }
  ],
  "icon": "fa fa-user",