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

fix: resolve conflicts

Browse Source
This commit is contained in:
Pandiyan P
2026-07-04 12:46:32 +05:30
committed by GitHub
parent 149af49d01
commit 3aad7fee24
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
View File

@@ -678,11 +678,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-06-30 12:18:34.132425",
=======
"modified": "2026-07-03 12:11:53.714931", "modified": "2026-07-03 12:11:53.714931",
>>>>>>> edfa0a7a1d (fix: remove company default on cost center in stock entry detail)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry Detail", "name": "Stock Entry Detail",