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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-08-06 22:24:45 +05:30
committed by GitHub
parent 06c3839abc
commit 22e63099ee
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/purchase_receipt/purchase_receipt.json
View File

@@ -1243,11 +1243,7 @@
"idx": 261, "idx": 261,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-11-13 16:55:14.129055",
=======
"modified": "2025-08-06 16:41:02.690658", "modified": "2025-08-06 16:41:02.690658",
>>>>>>> c433943c46 (fix: timeout while submitting purchase receipt)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",