nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 15:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: markdown to text editor set for supplier quotation

Browse Source 
(cherry picked from commit 9828d34b19)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
This commit is contained in:
Nihantra Patel
2024-03-28 10:30:13 +05:30
committed by Mergify
parent beb8807b2e
commit 5fb642831c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@@ -462,7 +462,7 @@
}, },
{ {
"fieldname": "other_charges_calculation", "fieldname": "other_charges_calculation",
"fieldtype": "Markdown Editor", "fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation", "label": "Taxes and Charges Calculation",
"no_copy": 1, "no_copy": 1,
"oldfieldtype": "HTML", "oldfieldtype": "HTML",
@@ -928,7 +928,11 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-03-20 16:03:59.069145", "modified": "2024-03-20 16:03:59.069145",
=======
"modified": "2024-03-28 10:20:30.231915",
>>>>>>> 9828d34b19 (fix: markdown to text editor set for supplier quotation)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation", "name": "Supplier Quotation",

2
erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
View File

@@ -71,7 +71,7 @@ class SupplierQuotation(BuyingController):
naming_series: DF.Literal["PUR-SQTN-.YYYY.-"] naming_series: DF.Literal["PUR-SQTN-.YYYY.-"]
net_total: DF.Currency net_total: DF.Currency
opportunity: DF.Link | None opportunity: DF.Link | None
other_charges_calculation: DF.MarkdownEditor | None other_charges_calculation: DF.TextEditor | None
plc_conversion_rate: DF.Float plc_conversion_rate: DF.Float
price_list_currency: DF.Link | None price_list_currency: DF.Link | None
pricing_rules: DF.Table[PricingRuleDetail] pricing_rules: DF.Table[PricingRuleDetail]