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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-02-07 21:45:35 +05:30
committed by GitHub
parent 5b7ee0af66
commit 66a4823640
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/buying/doctype/supplier/supplier.json
View File

@@ -486,11 +486,7 @@
"link_fieldname": "party" "link_fieldname": "party"
} }
], ],
<<<<<<< HEAD
"modified": "2024-05-08 18:02:57.342931",
=======
"modified": "2026-02-06 12:58:01.398824", "modified": "2026-02-06 12:58:01.398824",
>>>>>>> cfdc554a19 (fix(buying): add supplier group link filters in field level)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier", "name": "Supplier",
@@ -556,4 +552,4 @@
"states": [], "states": [],
"title_field": "supplier_name", "title_field": "supplier_name",
"track_changes": 1 "track_changes": 1
} }