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

fix: resolve backport merge conflicts in supplier.json

Browse Source 
Apply form-cleanup label changes while preserving the hotfix-only
no_copy flags and the alias field. Drop removed column_break_44 and
the duplicate is_frozen field_order entry.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
khushi8112
2026-06-23 16:10:11 +05:30
parent 2035fac494
commit a80de9bd01
1 changed files with 5 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,11 +12,8 @@
"field_order": [
"naming_series",
"supplier_name",
<<<<<<< HEAD
"alias",
=======
"supplier_type",
>>>>>>> 820c0caf88 (fix: supplier master form cleanup)
"alias",
"gender",
"column_break0",
"supplier_group",
@@ -63,16 +60,12 @@
"allow_purchase_invoice_creation_without_purchase_receipt",
"column_break_54",
"disabled",
<<<<<<< HEAD
=======
"is_frozen",
"block_supplier_section",
"on_hold",
"hold_type",
"release_date",
>>>>>>> 820c0caf88 (fix: supplier master form cleanup)
"rfq_and_purchase_order_settings_section",
"is_frozen",
"warn_rfqs",
"prevent_rfqs",
"column_break_oxjw",
@@ -395,12 +388,8 @@
"description": "Reselect, if the chosen contact is edited after save",
"fieldname": "supplier_primary_contact",
"fieldtype": "Link",
<<<<<<< HEAD
"label": "Supplier Primary Contact",
"no_copy": 1,
=======
"label": "Primary Contact",
>>>>>>> 820c0caf88 (fix: supplier master form cleanup)
"no_copy": 1,
"options": "Contact"
},
{
@@ -414,38 +403,22 @@
"fetch_from": "supplier_primary_contact.email_id",
"fieldname": "email_id",
"fieldtype": "Read Only",
<<<<<<< HEAD
"label": "Email Id",
"label": "Email ID",
"no_copy": 1
},
{
"fieldname": "column_break_44",
"fieldtype": "Column Break"
=======
"label": "Email ID"
>>>>>>> 820c0caf88 (fix: supplier master form cleanup)
},
{
"fieldname": "primary_address",
"fieldtype": "Text Editor",
<<<<<<< HEAD
"label": "Primary Address",
"no_copy": 1,
=======
"label": "Primary Address Preview",
>>>>>>> 820c0caf88 (fix: supplier master form cleanup)
"no_copy": 1,
"read_only": 1
},
{
"description": "Reselect, if the chosen address is edited after save",
"fieldname": "supplier_primary_address",
"fieldtype": "Link",
<<<<<<< HEAD
"label": "Supplier Primary Address",
"no_copy": 1,
=======
"label": "Primary Address",
>>>>>>> 820c0caf88 (fix: supplier master form cleanup)
"no_copy": 1,
"options": "Address"
},
{
@@ -588,11 +561,7 @@
"link_fieldname": "party"
}
],
<<<<<<< HEAD
"modified": "2026-06-22 12:23:09.241125",
=======
"modified": "2026-05-29 13:03:41.864602",
>>>>>>> 820c0caf88 (fix: supplier master form cleanup)
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier",