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

Merge pull request #42471 from Ninad1306/backport_changes

Browse Source 
fix: Field type is small text for v15
This commit is contained in:
Smit Vora
2024-07-26 14:04:39 +05:30
committed by GitHub
parent 422824b9e7 9e99eda3c3
commit 367b7eeeba
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
View File

@@ -183,13 +183,8 @@
}, },
{ {
"fieldname": "address_display", "fieldname": "address_display",
<<<<<<< HEAD
"fieldtype": "Small Text", "fieldtype": "Small Text",
"label": "Supplier Address Details",
=======
"fieldtype": "Text Editor",
"label": "Job Worker Address Details", "label": "Job Worker Address Details",
>>>>>>> 302339998f (fix: Fields Modification for Subcontracting DocTypes (#42383))
"read_only": 1 "read_only": 1
}, },
{ {