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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-06-16 20:37:19 +05:30
committed by GitHub
parent 7f30a2cfb6
commit ebdb23bdda
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/batch/batch.json
View File

@@ -209,11 +209,7 @@
"image_field": "image",
"links": [],
"max_attachments": 5,
<<<<<<< HEAD
"modified": "2023-11-09 12:17:28.339975",
=======
"modified": "2026-06-16 16:01:26.556324",
>>>>>>> 62f6d18143 (fix(stock): show only batched items in batch item selector)
"modified_by": "Administrator",
"module": "Stock",
"name": "Batch",