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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-02-23 10:58:12 +05:30
committed by GitHub
parent 91e9867fb1
commit 5e31eb3d77
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/purchase_invoice.json
View File

@@ -1689,11 +1689,7 @@
"idx": 204, "idx": 204,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2026-02-05 21:45:16.964500",
"modified": "2026-02-05 20:45:16.964500",
=======
"modified": "2026-02-04 16:32:19.664287",
>>>>>>> f3ea1863ae (refactor: Cleanup buying module forms)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",