nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-12 11:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-04-08 12:29:00 +05:30
committed by GitHub
parent d2c6a8958d
commit 39a4760e07
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/purchase_receipt_item/purchase_receipt_item.json
View File

@@ -1148,11 +1148,7 @@
"idx": 1,
"istable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2025-10-14 12:59:20.384056",
=======
"modified": "2026-04-07 15:40:47.032889",
>>>>>>> 90fd6f2e40 (fix: hardcoded precision causing decimal issues)
"modified": "2026-04-07 15:41:47.032889",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",