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

fix: use Text Editor for rendering tax breakup table

Browse Source 
(cherry picked from commit 1c63983873)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
This commit is contained in:
Gursheen Anand
2024-03-20 16:09:14 +05:30
committed by Mergify
parent bc5654b900
commit a95bb27c65
18 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -641,7 +641,7 @@
},
{
"fieldname": "other_charges_calculation",
"fieldtype": "Long Text",
"fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation",
"no_copy": 1,
"oldfieldtype": "HTML",
@@ -1275,7 +1275,11 @@
"idx": 105,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-10-01 20:58:07.851037",
=======
"modified": "2024-03-20 16:03:31.611808",
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",

3
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@@ -57,6 +57,7 @@ class PurchaseOrder(BuyingController):
additional_discount_percentage: DF.Float
address_display: DF.SmallText | None
advance_paid: DF.Currency
advance_payment_status: DF.Literal["Not Initiated", "Initiated", "Partially Paid", "Fully Paid"]
amended_from: DF.Link | None
apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
apply_tds: DF.Check
@@ -109,7 +110,7 @@ class PurchaseOrder(BuyingController):
net_total: DF.Currency
order_confirmation_date: DF.Date | None
order_confirmation_no: DF.Data | None
other_charges_calculation: DF.LongText | None
other_charges_calculation: DF.TextEditor | None
party_account_currency: DF.Link | None
payment_schedule: DF.Table[PaymentSchedule]
payment_terms_template: DF.Link | None

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

@@ -462,7 +462,7 @@
},
{
"fieldname": "other_charges_calculation",
"fieldtype": "Long Text",
"fieldtype": "Markdown Editor",
"label": "Taxes and Charges Calculation",
"no_copy": 1,
"oldfieldtype": "HTML",
@@ -928,7 +928,11 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-11-20 11:15:30.083077",
=======
"modified": "2024-03-20 16:03:59.069145",
>>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
"modified_by": "Administrator",
"module": "Buying",
"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.-"]
net_total: DF.Currency
opportunity: DF.Link | None
other_charges_calculation: DF.LongText | None
other_charges_calculation: DF.MarkdownEditor | None
plc_conversion_rate: DF.Float
price_list_currency: DF.Link | None
pricing_rules: DF.Table[PricingRuleDetail]