CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-11 22:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: inconsistent label name between parent and child

Browse Source 
(cherry picked from commit d6e1ca0f10)

# Conflicts:
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json
This commit is contained in:
Mihir Kandoi
2026-02-20 16:40:32 +05:30
committed by Mergify
parent 5eb4baccd6
commit 1bf608f835
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/selling/doctype/sales_order_item/sales_order_item.json
View File

@@ -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",