From 4753594a26901a9d852d01d65690a4af514bfa70 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 24 Dec 2025 14:31:12 +0530 Subject: [PATCH 1/2] perf: index for warehouse field (cherry picked from commit 23c70332dfd694f204dd4815bf91c7a96f9941ef) # Conflicts: # erpnext/stock/doctype/serial_no/serial_no.json --- erpnext/stock/doctype/serial_no/serial_no.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json index 924277b30ea..5df48737973 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.json +++ b/erpnext/stock/doctype/serial_no/serial_no.json @@ -234,7 +234,8 @@ "in_list_view": 1, "label": "Warehouse", "options": "Warehouse", - "read_only": 1 + "read_only": 1, + "search_index": 1 }, { "fieldname": "batch_no", @@ -282,7 +283,11 @@ "icon": "fa fa-barcode", "idx": 1, "links": [], +<<<<<<< HEAD "modified": "2025-07-15 13:40:21.938700", +======= + "modified": "2025-12-24 14:30:43.599590", +>>>>>>> 23c70332df (perf: index for warehouse field) "modified_by": "Administrator", "module": "Stock", "name": "Serial No", From 35ae839ab70f8ac470d372d1d3007dc0e886e415 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 24 Dec 2025 15:06:48 +0530 Subject: [PATCH 2/2] chore: fix conflicts --- erpnext/stock/doctype/serial_no/serial_no.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json index 5df48737973..a81517cf7eb 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.json +++ b/erpnext/stock/doctype/serial_no/serial_no.json @@ -283,11 +283,7 @@ "icon": "fa fa-barcode", "idx": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-07-15 13:40:21.938700", -======= "modified": "2025-12-24 14:30:43.599590", ->>>>>>> 23c70332df (perf: index for warehouse field) "modified_by": "Administrator", "module": "Stock", "name": "Serial No",