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

chore: resolve conflicts

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

12
erpnext/selling/doctype/customer/customer.json
View File

@@ -130,6 +130,7 @@
"fieldtype": "Data",
"in_global_search": 1,
"label": "Alias",
"no_copy": 1,
"unique": 1
},
{
@@ -682,17 +683,6 @@
{
"fieldname": "credit_limit_column",
"fieldtype": "Column 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)
}
],
"icon": "fa fa-user",