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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-06-16 15:09:32 +05:30
committed by Sudharsanan11
parent d2fee32eb3
commit 1e027364e3
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/stock_entry.json
View File

@@ -768,11 +768,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2026-03-04 19:03:23.426082",
=======
"modified": "2026-06-11 18:23:12.340065",
>>>>>>> dceb9a3c6c (fix(stock): enable quality inspection for all Stock Entry purposes)
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry",