nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-02-19 10:51:40 +05:30
committed by GitHub
parent c3626d67ca
commit 6d32089d9e
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
View File

@@ -314,11 +314,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-02-07 16:05:17.772098",
=======
"modified": "2026-02-19 10:17:28.695394", "modified": "2026-02-19 10:17:28.695394",
>>>>>>> 21452b4c6e (fix: reservation based on field should be read only in SRE)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Reservation Entry", "name": "Stock Reservation Entry",
@@ -428,4 +424,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }