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

chore: resolve conflict

Browse Source
This commit is contained in:
ravibharathi656
2026-03-27 11:24:35 +05:30
parent f2195fa67d
commit d12b54c50a
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@@ -9,11 +9,6 @@
"engine": "InnoDB", "engine": "InnoDB",
"field_order": [ "field_order": [
"supplier_section", "supplier_section",
<<<<<<< HEAD
"title",
=======
"company",
>>>>>>> 5b1fa81451 (fix(accounts): set supplier name as title field in Purchase Invoice (#53710))
"naming_series", "naming_series",
"supplier", "supplier",
"supplier_name", "supplier_name",