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

chore: fix conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-06-27 16:34:20 +05:30
committed by GitHub
parent 0b42241682
commit e64e9866fb
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,6 +110,7 @@
"fieldtype": "Data", "fieldtype": "Data",
"in_global_search": 1, "in_global_search": 1,
"label": "Alias", "label": "Alias",
"no_copy": 1,
"unique": 1 "unique": 1
}, },
{ {
@@ -548,17 +549,6 @@
{ {
"fieldname": "section_break_pgad", "fieldname": "section_break_pgad",
"fieldtype": "Section Break" "fieldtype": "Section Break"
<<<<<<< HEAD
=======
},
{
"fieldname": "alias",
"fieldtype": "Data",
"in_global_search": 1,
"label": "Alias",
"no_copy": 1,
"unique": 1
>>>>>>> 057af21cd8 (fix: party aliases should be no copy)
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,