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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-10-14 17:17:12 +05:30
committed by GitHub
parent 79a8e2656b
commit 8bf553bbce
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_entry_detail/stock_entry_detail.json
View File

@@ -616,11 +616,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2025-10-14 15:10:38.373099",
"modified": "2025-03-26 21:01:58.544797",
=======
"modified": "2025-10-14 14:10:38.373099",
>>>>>>> e7b64175fd (perf: optimize sql query)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry Detail", "name": "Stock Entry Detail",