From 1bf608f8358b93a81e857f2c0be1e4032d53bf17 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Fri, 20 Feb 2026 16:40:32 +0530 Subject: [PATCH 1/2] fix: inconsistent label name between parent and child (cherry picked from commit d6e1ca0f101480ea8d4e78f63af4b39d134b88c9) # Conflicts: # erpnext/selling/doctype/sales_order_item/sales_order_item.json --- .../doctype/sales_order_item/sales_order_item.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index 21054a9d81b..b4733beb142 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -523,8 +523,12 @@ "depends_on": "eval:doc.delivered_by_supplier!=1", "fieldname": "warehouse", "fieldtype": "Link", +<<<<<<< HEAD "in_list_view": 1, "label": "Delivery Warehouse", +======= + "label": "Source Warehouse", +>>>>>>> d6e1ca0f10 (fix: inconsistent label name between parent and child) "oldfieldname": "reserved_warehouse", "oldfieldtype": "Link", "options": "Warehouse", @@ -971,7 +975,11 @@ "idx": 1, "istable": 1, "links": [], +<<<<<<< HEAD "modified": "2025-02-28 09:45:44.934947", +======= + "modified": "2026-02-20 16:39:00.200328", +>>>>>>> d6e1ca0f10 (fix: inconsistent label name between parent and child) "modified_by": "Administrator", "module": "Selling", "name": "Sales Order Item", From 58d969417371786e1909f5dd525b27189b3c8d95 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Fri, 20 Feb 2026 17:01:17 +0530 Subject: [PATCH 2/2] chore: resolve conflicts --- .../doctype/sales_order_item/sales_order_item.json | 8 -------- 1 file changed, 8 deletions(-) diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json index b4733beb142..7edb81de48b 100644 --- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json +++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json @@ -523,12 +523,8 @@ "depends_on": "eval:doc.delivered_by_supplier!=1", "fieldname": "warehouse", "fieldtype": "Link", -<<<<<<< HEAD "in_list_view": 1, - "label": "Delivery Warehouse", -======= "label": "Source Warehouse", ->>>>>>> d6e1ca0f10 (fix: inconsistent label name between parent and child) "oldfieldname": "reserved_warehouse", "oldfieldtype": "Link", "options": "Warehouse", @@ -975,11 +971,7 @@ "idx": 1, "istable": 1, "links": [], -<<<<<<< HEAD - "modified": "2025-02-28 09:45:44.934947", -======= "modified": "2026-02-20 16:39:00.200328", ->>>>>>> d6e1ca0f10 (fix: inconsistent label name between parent and child) "modified_by": "Administrator", "module": "Selling", "name": "Sales Order Item",