CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-11 22:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40571 from frappe/mergify/bp/version-14-hotfix/pr-40563

Browse Source 
fix: use `Text Editor` for rendering tax breakup table (backport #40563)
This commit is contained in:
Gursheen Kaur Anand
2024-03-20 20:39:19 +05:30
committed by GitHub
parent 785131121d cf3b0ee41e
commit 33e0371c4d
10 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

@@ -639,7 +639,7 @@
},
{
"fieldname": "other_charges_calculation",
"fieldtype": "Long Text",
"fieldtype": "Text Editor",
"label": "Taxes and Charges Calculation",
"no_copy": 1,
"oldfieldtype": "HTML",
@@ -1273,7 +1273,7 @@
"idx": 105,
"is_submittable": 1,
"links": [],
"modified": "2023-10-01 20:58:07.851037",
"modified": "2024-03-20 16:03:31.611808",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",

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

@@ -461,7 +461,7 @@
},
{
"fieldname": "other_charges_calculation",
"fieldtype": "Long Text",
"fieldtype": "Markdown Editor",
"label": "Taxes and Charges Calculation",
"no_copy": 1,
"oldfieldtype": "HTML",
@@ -927,7 +927,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
"modified": "2023-11-20 11:15:30.083077",
"modified": "2024-03-20 16:03:59.069145",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier Quotation",

4
erpnext/public/scss/erpnext.scss
View File

@@ -496,3 +496,7 @@ body[data-route="pos"] {
.exercise-col {
padding: 10px;
}
.frappe-control[data-fieldname="other_charges_calculation"] .ql-editor {
white-space: normal;
}

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

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

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

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

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

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

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

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