nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-02-20 17:01:17 +05:30
committed by GitHub
parent 1bf608f835
commit 58d9694173
1 changed files with 0 additions and 8 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,12 +523,8 @@
"depends_on": "eval:doc.delivered_by_supplier!=1", "depends_on": "eval:doc.delivered_by_supplier!=1",
"fieldname": "warehouse", "fieldname": "warehouse",
"fieldtype": "Link", "fieldtype": "Link",
<<<<<<< HEAD
"in_list_view": 1, "in_list_view": 1,
"label": "Delivery Warehouse",
=======
"label": "Source Warehouse", "label": "Source Warehouse",
>>>>>>> d6e1ca0f10 (fix: inconsistent label name between parent and child)
"oldfieldname": "reserved_warehouse", "oldfieldname": "reserved_warehouse",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Warehouse", "options": "Warehouse",
@@ -975,11 +971,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2025-02-28 09:45:44.934947",
=======
"modified": "2026-02-20 16:39:00.200328", "modified": "2026-02-20 16:39:00.200328",
>>>>>>> d6e1ca0f10 (fix: inconsistent label name between parent and child)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order Item", "name": "Sales Order Item",