nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-20 09:49:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-07-13 11:54:45 +05:30
committed by GitHub
parent b7f276989d
commit 94d1fd6c42
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

@@ -1662,11 +1662,7 @@
"idx": 204,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2026-03-17 20:44:00.221219",
=======
"modified": "2026-07-12 23:54:21.263951",
>>>>>>> 6729a53fee (fix: make represents company field in purchase invoice ignore user permissions)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",