nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 13:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-04-08 14:05:04 +05:30
committed by GitHub
parent 39a4760e07
commit 21607f39c5
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
View File

@@ -983,11 +983,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2026-04-07 15:41:45.687554",
"modified": "2025-10-14 13:01:54.441511",
=======
"modified": "2026-04-07 15:40:45.687554",
>>>>>>> 90fd6f2e40 (fix: hardcoded precision causing decimal issues)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice Item", "name": "Purchase Invoice Item",