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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-02-06 12:00:23 +05:30
committed by GitHub
parent c0c6cc58ed
commit f56c6f93a1
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@@ -1669,11 +1669,7 @@
"idx": 204, "idx": 204,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-02-03 14:23:47.937128",
=======
"modified": "2026-02-05 20:45:16.964500", "modified": "2026-02-05 20:45:16.964500",
>>>>>>> 5fb5b7b30e (fix: do not show update stock flag unneccessarily)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",