nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 07:52:13 +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

4
erpnext/accounts/doctype/pos_invoice/pos_invoice.json
View File

@@ -775,7 +775,7 @@
}, },
{ {
"fieldname": "other_charges_calculation", "fieldname": "other_charges_calculation",
"fieldtype": "Long Text", "fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation", "label": "Taxes and Charges Calculation",
"no_copy": 1, "no_copy": 1,
"oldfieldtype": "HTML", "oldfieldtype": "HTML",
@@ -1563,7 +1563,7 @@
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2023-11-20 12:27:12.848149", "modified": "2024-03-20 16:00:34.268756",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Invoice", "name": "POS Invoice",

2
erpnext/accounts/doctype/pos_invoice/pos_invoice.py
View File

@@ -109,7 +109,7 @@ class POSInvoice(SalesInvoice):
loyalty_redemption_cost_center: DF.Link | None loyalty_redemption_cost_center: DF.Link | None
naming_series: DF.Literal["ACC-PSINV-.YYYY.-"] naming_series: DF.Literal["ACC-PSINV-.YYYY.-"]
net_total: DF.Currency net_total: DF.Currency
other_charges_calculation: DF.LongText | None other_charges_calculation: DF.TextEditor | None
outstanding_amount: DF.Currency outstanding_amount: DF.Currency
packed_items: DF.Table[PackedItem] packed_items: DF.Table[PackedItem]
paid_amount: DF.Currency paid_amount: DF.Currency

4
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@@ -760,7 +760,7 @@
}, },
{ {
"fieldname": "other_charges_calculation", "fieldname": "other_charges_calculation",
"fieldtype": "Long Text", "fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation", "label": "Taxes and Charges Calculation",
"no_copy": 1, "no_copy": 1,
"oldfieldtype": "HTML", "oldfieldtype": "HTML",
@@ -1637,7 +1637,7 @@
"idx": 204, "idx": 204,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2024-03-11 14:46:30.298184", "modified": "2024-03-20 15:57:00.736868",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

2
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -147,7 +147,7 @@ class PurchaseInvoice(BuyingController):
net_total: DF.Currency net_total: DF.Currency
on_hold: DF.Check on_hold: DF.Check
only_include_allocated_payments: DF.Check only_include_allocated_payments: DF.Check
other_charges_calculation: DF.LongText | None other_charges_calculation: DF.TextEditor | None
outstanding_amount: DF.Currency outstanding_amount: DF.Currency
paid_amount: DF.Currency paid_amount: DF.Currency
party_account_currency: DF.Link | None party_account_currency: DF.Link | None

6
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@@ -944,7 +944,7 @@
}, },
{ {
"fieldname": "other_charges_calculation", "fieldname": "other_charges_calculation",
"fieldtype": "Long Text", "fieldtype": "Text Editor",
"hide_days": 1, "hide_days": 1,
"hide_seconds": 1, "hide_seconds": 1,
"label": "Taxes and Charges Calculation", "label": "Taxes and Charges Calculation",
@@ -2184,7 +2184,7 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
"modified": "2024-03-15 16:44:17.778370", "modified": "2024-03-20 16:02:52.237732",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",
@@ -2239,4 +2239,4 @@
"title_field": "title", "title_field": "title",
"track_changes": 1, "track_changes": 1,
"track_seen": 1 "track_seen": 1
} }

2
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -146,7 +146,7 @@ class SalesInvoice(SellingController):
naming_series: DF.Literal["ACC-SINV-.YYYY.-", "ACC-SINV-RET-.YYYY.-"] naming_series: DF.Literal["ACC-SINV-.YYYY.-", "ACC-SINV-RET-.YYYY.-"]
net_total: DF.Currency net_total: DF.Currency
only_include_allocated_payments: DF.Check only_include_allocated_payments: DF.Check
other_charges_calculation: DF.LongText | None other_charges_calculation: DF.TextEditor | None
outstanding_amount: DF.Currency outstanding_amount: DF.Currency
packed_items: DF.Table[PackedItem] packed_items: DF.Table[PackedItem]
paid_amount: DF.Currency paid_amount: DF.Currency

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

@@ -641,7 +641,7 @@
}, },
{ {
"fieldname": "other_charges_calculation", "fieldname": "other_charges_calculation",
"fieldtype": "Long Text", "fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation", "label": "Taxes and Charges Calculation",
"no_copy": 1, "no_copy": 1,
"oldfieldtype": "HTML", "oldfieldtype": "HTML",
@@ -1275,7 +1275,11 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-10-01 20:58:07.851037", "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", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "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 additional_discount_percentage: DF.Float
address_display: DF.SmallText | None address_display: DF.SmallText | None
advance_paid: DF.Currency advance_paid: DF.Currency
advance_payment_status: DF.Literal["Not Initiated", "Initiated", "Partially Paid", "Fully Paid"]
amended_from: DF.Link | None amended_from: DF.Link | None
apply_discount_on: DF.Literal["", "Grand Total", "Net Total"] apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
apply_tds: DF.Check apply_tds: DF.Check
@@ -109,7 +110,7 @@ class PurchaseOrder(BuyingController):
net_total: DF.Currency net_total: DF.Currency
order_confirmation_date: DF.Date | None order_confirmation_date: DF.Date | None
order_confirmation_no: DF.Data | 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 party_account_currency: DF.Link | None
payment_schedule: DF.Table[PaymentSchedule] payment_schedule: DF.Table[PaymentSchedule]
payment_terms_template: DF.Link | None 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", "fieldname": "other_charges_calculation",
"fieldtype": "Long Text", "fieldtype": "Markdown 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": "2023-11-20 11:15:30.083077", "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", "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.LongText | None other_charges_calculation: DF.MarkdownEditor | 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]

4
erpnext/selling/doctype/quotation/quotation.json
View File

@@ -557,7 +557,7 @@
}, },
{ {
"fieldname": "other_charges_calculation", "fieldname": "other_charges_calculation",
"fieldtype": "Long Text", "fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation", "label": "Taxes and Charges Calculation",
"no_copy": 1, "no_copy": 1,
"oldfieldtype": "HTML", "oldfieldtype": "HTML",
@@ -1073,7 +1073,7 @@
"idx": 82, "idx": 82,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2023-06-03 16:21:04.980033", "modified": "2024-03-20 16:04:21.567847",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation", "name": "Quotation",

2
erpnext/selling/doctype/quotation/quotation.py
View File

@@ -78,7 +78,7 @@ class Quotation(SellingController):
opportunity: DF.Link | None opportunity: DF.Link | None
order_lost_reason: DF.SmallText | None order_lost_reason: DF.SmallText | None
order_type: DF.Literal["", "Sales", "Maintenance", "Shopping Cart"] order_type: DF.Literal["", "Sales", "Maintenance", "Shopping Cart"]
other_charges_calculation: DF.LongText | None other_charges_calculation: DF.TextEditor | None
packed_items: DF.Table[PackedItem] packed_items: DF.Table[PackedItem]
party_name: DF.DynamicLink | None party_name: DF.DynamicLink | None
payment_schedule: DF.Table[PaymentSchedule] payment_schedule: DF.Table[PaymentSchedule]

4
erpnext/selling/doctype/sales_order/sales_order.json
View File

@@ -776,7 +776,7 @@
}, },
{ {
"fieldname": "other_charges_calculation", "fieldname": "other_charges_calculation",
"fieldtype": "Long Text", "fieldtype": "Text Editor",
"hide_days": 1, "hide_days": 1,
"hide_seconds": 1, "hide_seconds": 1,
"label": "Taxes and Charges Calculation", "label": "Taxes and Charges Calculation",
@@ -1644,7 +1644,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2023-10-18 12:41:54.813462", "modified": "2024-03-20 16:04:43.627183",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",

4
erpnext/selling/doctype/sales_order/sales_order.py
View File

@@ -66,6 +66,7 @@ class SalesOrder(SellingController):
additional_discount_percentage: DF.Float additional_discount_percentage: DF.Float
address_display: DF.SmallText | None address_display: DF.SmallText | None
advance_paid: DF.Currency advance_paid: DF.Currency
advance_payment_status: DF.Literal["Not Requested", "Requested", "Partially Paid", "Fully Paid"]
amended_from: DF.Link | None amended_from: DF.Link | None
amount_eligible_for_commission: DF.Currency amount_eligible_for_commission: DF.Currency
apply_discount_on: DF.Literal["", "Grand Total", "Net Total"] apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
@@ -122,7 +123,7 @@ class SalesOrder(SellingController):
naming_series: DF.Literal["SAL-ORD-.YYYY.-"] naming_series: DF.Literal["SAL-ORD-.YYYY.-"]
net_total: DF.Currency net_total: DF.Currency
order_type: DF.Literal["", "Sales", "Maintenance", "Shopping Cart"] order_type: DF.Literal["", "Sales", "Maintenance", "Shopping Cart"]
other_charges_calculation: DF.LongText | None other_charges_calculation: DF.TextEditor | None
packed_items: DF.Table[PackedItem] packed_items: DF.Table[PackedItem]
party_account_currency: DF.Link | None party_account_currency: DF.Link | None
payment_schedule: DF.Table[PaymentSchedule] payment_schedule: DF.Table[PaymentSchedule]
@@ -155,6 +156,7 @@ class SalesOrder(SellingController):
"", "",
"Draft", "Draft",
"On Hold", "On Hold",
"To Pay",
"To Deliver and Bill", "To Deliver and Bill",
"To Bill", "To Bill",
"To Deliver", "To Deliver",

4
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@@ -680,7 +680,7 @@
}, },
{ {
"fieldname": "other_charges_calculation", "fieldname": "other_charges_calculation",
"fieldtype": "Long Text", "fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation", "label": "Taxes and Charges Calculation",
"no_copy": 1, "no_copy": 1,
"oldfieldtype": "HTML", "oldfieldtype": "HTML",
@@ -1397,7 +1397,7 @@
"idx": 146, "idx": 146,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2024-03-05 11:58:47.784349", "modified": "2024-03-20 16:05:02.854990",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",

4
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@@ -76,7 +76,7 @@ class DeliveryNote(SellingController):
ignore_pricing_rule: DF.Check ignore_pricing_rule: DF.Check
in_words: DF.Data | None in_words: DF.Data | None
incoterm: DF.Link | None incoterm: DF.Link | None
installation_status: DF.Literal installation_status: DF.Literal[None]
instructions: DF.Text | None instructions: DF.Text | None
inter_company_reference: DF.Link | None inter_company_reference: DF.Link | None
is_internal_customer: DF.Check is_internal_customer: DF.Check
@@ -90,7 +90,7 @@ class DeliveryNote(SellingController):
named_place: DF.Data | None named_place: DF.Data | None
naming_series: DF.Literal["MAT-DN-.YYYY.-", "MAT-DN-RET-.YYYY.-"] naming_series: DF.Literal["MAT-DN-.YYYY.-", "MAT-DN-RET-.YYYY.-"]
net_total: DF.Currency net_total: DF.Currency
other_charges_calculation: DF.LongText | None other_charges_calculation: DF.TextEditor | None
packed_items: DF.Table[PackedItem] packed_items: DF.Table[PackedItem]
per_billed: DF.Percent per_billed: DF.Percent
per_installed: DF.Percent per_installed: DF.Percent

4
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@@ -651,7 +651,7 @@
}, },
{ {
"fieldname": "other_charges_calculation", "fieldname": "other_charges_calculation",
"fieldtype": "Long Text", "fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation", "label": "Taxes and Charges Calculation",
"no_copy": 1, "no_copy": 1,
"oldfieldtype": "HTML", "oldfieldtype": "HTML",
@@ -1252,7 +1252,7 @@
"idx": 261, "idx": 261,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2023-12-18 17:26:41.279663", "modified": "2024-03-20 16:05:31.713453",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",

2
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@@ -86,7 +86,7 @@ class PurchaseReceipt(BuyingController):
named_place: DF.Data | None named_place: DF.Data | None
naming_series: DF.Literal["MAT-PRE-.YYYY.-", "MAT-PR-RET-.YYYY.-"] naming_series: DF.Literal["MAT-PRE-.YYYY.-", "MAT-PR-RET-.YYYY.-"]
net_total: DF.Currency net_total: DF.Currency
other_charges_calculation: DF.LongText | None other_charges_calculation: DF.TextEditor | None
per_billed: DF.Percent per_billed: DF.Percent
per_returned: DF.Percent per_returned: DF.Percent
plc_conversion_rate: DF.Float plc_conversion_rate: DF.Float