nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-10-14 13:33:56 +05:30
committed by GitHub
parent 967ee78415
commit 61f7309695
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

@@ -1149,11 +1149,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2025-10-14 12:59:20.384056",
"modified": "2025-03-12 17:10:43.780622",
=======
"modified": "2025-10-14 12:58:20.384056",
>>>>>>> 1afc75b15a (fix: performance issue by adding index)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt Item", "name": "Purchase Receipt Item",