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

fix: resolve backport merge conflicts in customer.json

Browse Source 
Keep both customer_type (list view) and the hotfix-only alias field in
field_order; take the newest modified timestamp.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
khushi8112
2026-06-23 16:14:24 +05:30
parent c788106011
commit 77121f2a41
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,11 +13,8 @@
"basic_info",
"naming_series",
"customer_name",
<<<<<<< HEAD
"alias",
=======
"customer_type",
>>>>>>> 059f560017 (fix: add customer type in the list view)
"alias",
"gender",
"column_break0",
"customer_group",
@@ -698,15 +695,7 @@
"link_fieldname": "party"
}
],
<<<<<<< HEAD
<<<<<<< HEAD
"modified": "2026-06-22 12:23:19.196991",
=======
"modified": "2026-05-27 17:07:25.099707",
>>>>>>> 6f6e17188f (fix: customer master form cleanup)
=======
"modified": "2026-05-29 02:21:41.089319",
>>>>>>> 059f560017 (fix: add customer type in the list view)
"modified_by": "Administrator",
"module": "Selling",
"name": "Customer",