mirror of
https://github.com/frappe/erpnext.git
synced 2026-02-18 09:05:00 +00:00
fix: change docfield type to render html format (#51795)
(cherry picked from commit 3fe5b5c80d)
Co-authored-by: Sowmya <106989392+SowmyaArunachalam@users.noreply.github.com>
This commit is contained in:
@@ -383,7 +383,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "primary_address",
|
"fieldname": "primary_address",
|
||||||
"fieldtype": "Text",
|
"fieldtype": "Text Editor",
|
||||||
"label": "Primary Address",
|
"label": "Primary Address",
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
@@ -500,7 +500,7 @@
|
|||||||
"link_fieldname": "party"
|
"link_fieldname": "party"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"modified": "2025-06-29 05:30:50.398653",
|
"modified": "2026-01-16 15:56:31.139206",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Buying",
|
"module": "Buying",
|
||||||
"name": "Supplier",
|
"name": "Supplier",
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ class Supplier(TransactionBase):
|
|||||||
portal_users: DF.Table[PortalUser]
|
portal_users: DF.Table[PortalUser]
|
||||||
prevent_pos: DF.Check
|
prevent_pos: DF.Check
|
||||||
prevent_rfqs: DF.Check
|
prevent_rfqs: DF.Check
|
||||||
primary_address: DF.Text | None
|
primary_address: DF.TextEditor | None
|
||||||
release_date: DF.Date | None
|
release_date: DF.Date | None
|
||||||
represents_company: DF.Link | None
|
represents_company: DF.Link | None
|
||||||
supplier_details: DF.Text | None
|
supplier_details: DF.Text | None
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ erpnext.utils.get_address_display = function (frm, address_field, display_field,
|
|||||||
args: { address_dict: frm.doc[address_field] },
|
args: { address_dict: frm.doc[address_field] },
|
||||||
callback: function (r) {
|
callback: function (r) {
|
||||||
if (r.message) {
|
if (r.message) {
|
||||||
frm.set_value(display_field, frappe.utils.html2text(r.message));
|
frm.set_value(display_field, r.message);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -335,7 +335,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "primary_address",
|
"fieldname": "primary_address",
|
||||||
"fieldtype": "Text",
|
"fieldtype": "Text Editor",
|
||||||
"label": "Primary Address",
|
"label": "Primary Address",
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
@@ -625,7 +625,7 @@
|
|||||||
"link_fieldname": "party"
|
"link_fieldname": "party"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"modified": "2025-11-25 09:35:56.772949",
|
"modified": "2026-01-16 15:56:05.967663",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Selling",
|
"module": "Selling",
|
||||||
"name": "Customer",
|
"name": "Customer",
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ class Customer(TransactionBase):
|
|||||||
opportunity_name: DF.Link | None
|
opportunity_name: DF.Link | None
|
||||||
payment_terms: DF.Link | None
|
payment_terms: DF.Link | None
|
||||||
portal_users: DF.Table[PortalUser]
|
portal_users: DF.Table[PortalUser]
|
||||||
primary_address: DF.Text | None
|
primary_address: DF.TextEditor | None
|
||||||
prospect_name: DF.Link | None
|
prospect_name: DF.Link | None
|
||||||
represents_company: DF.Link | None
|
represents_company: DF.Link | None
|
||||||
sales_team: DF.Table[SalesTeam]
|
sales_team: DF.Table[SalesTeam]
|
||||||
|
|||||||
@@ -115,7 +115,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "pickup_address",
|
"fieldname": "pickup_address",
|
||||||
"fieldtype": "Small Text",
|
"fieldtype": "Text Editor",
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -135,7 +135,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "pickup_contact",
|
"fieldname": "pickup_contact",
|
||||||
"fieldtype": "Small Text",
|
"fieldtype": "Text Editor",
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -193,7 +193,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fieldname": "delivery_address",
|
"fieldname": "delivery_address",
|
||||||
"fieldtype": "Small Text",
|
"fieldtype": "Text Editor",
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -214,7 +214,7 @@
|
|||||||
{
|
{
|
||||||
"depends_on": "eval:doc.delivery_contact_name",
|
"depends_on": "eval:doc.delivery_contact_name",
|
||||||
"fieldname": "delivery_contact",
|
"fieldname": "delivery_contact",
|
||||||
"fieldtype": "Small Text",
|
"fieldtype": "Text Editor",
|
||||||
"read_only": 1
|
"read_only": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -441,11 +441,11 @@
|
|||||||
],
|
],
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
"modified": "2026-01-07 19:24:23.566312",
|
"modified": "2026-01-16 14:59:28.547953",
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Stock",
|
"module": "Stock",
|
||||||
"name": "Shipment",
|
"name": "Shipment",
|
||||||
"naming_rule": "Expression (old style)",
|
"naming_rule": "Expression",
|
||||||
"owner": "Administrator",
|
"owner": "Administrator",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
@@ -477,8 +477,9 @@
|
|||||||
"write": 1
|
"write": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"row_format": "Dynamic",
|
||||||
"sort_field": "creation",
|
"sort_field": "creation",
|
||||||
"sort_order": "DESC",
|
"sort_order": "DESC",
|
||||||
"states": [],
|
"states": [],
|
||||||
"track_changes": 1
|
"track_changes": 1
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,10 +27,10 @@ class Shipment(Document):
|
|||||||
awb_number: DF.Data | None
|
awb_number: DF.Data | None
|
||||||
carrier: DF.Data | None
|
carrier: DF.Data | None
|
||||||
carrier_service: DF.Data | None
|
carrier_service: DF.Data | None
|
||||||
delivery_address: DF.SmallText | None
|
delivery_address: DF.TextEditor | None
|
||||||
delivery_address_name: DF.Link
|
delivery_address_name: DF.Link
|
||||||
delivery_company: DF.Link | None
|
delivery_company: DF.Link | None
|
||||||
delivery_contact: DF.SmallText | None
|
delivery_contact: DF.TextEditor | None
|
||||||
delivery_contact_email: DF.Data | None
|
delivery_contact_email: DF.Data | None
|
||||||
delivery_contact_name: DF.Link | None
|
delivery_contact_name: DF.Link | None
|
||||||
delivery_customer: DF.Link | None
|
delivery_customer: DF.Link | None
|
||||||
@@ -42,10 +42,10 @@ class Shipment(Document):
|
|||||||
pallets: DF.Literal["No", "Yes"]
|
pallets: DF.Literal["No", "Yes"]
|
||||||
parcel_template: DF.Link | None
|
parcel_template: DF.Link | None
|
||||||
pickup: DF.Data | None
|
pickup: DF.Data | None
|
||||||
pickup_address: DF.SmallText | None
|
pickup_address: DF.TextEditor | None
|
||||||
pickup_address_name: DF.Link
|
pickup_address_name: DF.Link
|
||||||
pickup_company: DF.Link | None
|
pickup_company: DF.Link | None
|
||||||
pickup_contact: DF.SmallText | None
|
pickup_contact: DF.TextEditor | None
|
||||||
pickup_contact_email: DF.Data | None
|
pickup_contact_email: DF.Data | None
|
||||||
pickup_contact_name: DF.Link | None
|
pickup_contact_name: DF.Link | None
|
||||||
pickup_contact_person: DF.Link | None
|
pickup_contact_person: DF.Link | None
|
||||||
|
|||||||
Reference in New Issue
Block a user