Merge pull request #42471 from Ninad1306/backport_changes

fix: Field type is small text for v15
2026-03-18 09:47:14 +00:00 · 2024-07-26 14:04:39 +05:30
parent 422824b9e7 9e99eda3c3
commit 367b7eeeba
1 changed files with 0 additions and 5 deletions
--- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
+++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -183,13 +183,8 @@
  },
  {
   "fieldname": "address_display",
-<<<<<<< HEAD
   "fieldtype": "Small Text",
-   "label": "Supplier Address Details",
-=======
-   "fieldtype": "Text Editor",
   "label": "Job Worker Address Details",
->>>>>>> 302339998f (fix: Fields Modification for Subcontracting DocTypes (#42383))
   "read_only": 1
  },
  {