From e055147849d76ba6bff84033a472880e84aa73d0 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 25 Mar 2024 11:16:16 +0530 Subject: [PATCH] fix: address_display, text -> text editor (#40621) * fix: address_display, text -> text editor * fix: text -> text editor for shipping and dispatch_address --- erpnext/accounts/doctype/dunning/dunning.json | 6 +++--- erpnext/accounts/doctype/dunning/dunning.py | 4 ++-- erpnext/accounts/doctype/pos_invoice/pos_invoice.json | 8 ++++---- erpnext/accounts/doctype/pos_invoice/pos_invoice.py | 6 +++--- .../doctype/purchase_invoice/purchase_invoice.json | 8 ++++---- .../doctype/purchase_invoice/purchase_invoice.py | 6 +++--- .../accounts/doctype/sales_invoice/sales_invoice.json | 10 +++++----- .../accounts/doctype/sales_invoice/sales_invoice.py | 8 ++++---- .../buying/doctype/purchase_order/purchase_order.json | 8 ++++---- .../buying/doctype/purchase_order/purchase_order.py | 6 +++--- .../request_for_quotation/request_for_quotation.json | 4 ++-- .../request_for_quotation/request_for_quotation.py | 2 +- .../doctype/supplier_quotation/supplier_quotation.json | 8 ++++---- .../doctype/supplier_quotation/supplier_quotation.py | 6 +++--- erpnext/crm/doctype/opportunity/opportunity.json | 4 ++-- erpnext/crm/doctype/opportunity/opportunity.py | 2 +- .../maintenance_schedule/maintenance_schedule.json | 4 ++-- .../maintenance_schedule/maintenance_schedule.py | 2 +- .../doctype/maintenance_visit/maintenance_visit.json | 4 ++-- .../doctype/maintenance_visit/maintenance_visit.py | 2 +- erpnext/public/scss/erpnext.scss | 10 +++++++++- .../doctype/installation_note/installation_note.json | 6 +++--- .../doctype/installation_note/installation_note.py | 3 ++- erpnext/selling/doctype/quotation/quotation.json | 8 ++++---- erpnext/selling/doctype/quotation/quotation.py | 6 +++--- erpnext/selling/doctype/sales_order/sales_order.json | 10 +++++----- erpnext/selling/doctype/sales_order/sales_order.py | 8 ++++---- erpnext/stock/doctype/delivery_note/delivery_note.json | 10 +++++----- erpnext/stock/doctype/delivery_note/delivery_note.py | 8 ++++---- .../doctype/purchase_receipt/purchase_receipt.json | 8 ++++---- .../stock/doctype/purchase_receipt/purchase_receipt.py | 6 +++--- erpnext/stock/doctype/stock_entry/stock_entry.json | 8 ++++---- erpnext/stock/doctype/stock_entry/stock_entry.py | 6 +++--- .../subcontracting_order/subcontracting_order.json | 8 ++++---- .../subcontracting_order/subcontracting_order.py | 6 +++--- .../subcontracting_receipt/subcontracting_receipt.json | 8 ++++---- .../subcontracting_receipt/subcontracting_receipt.py | 6 +++--- .../support/doctype/warranty_claim/warranty_claim.json | 4 ++-- .../support/doctype/warranty_claim/warranty_claim.py | 2 +- 39 files changed, 124 insertions(+), 115 deletions(-) diff --git a/erpnext/accounts/doctype/dunning/dunning.json b/erpnext/accounts/doctype/dunning/dunning.json index b7e8aeaaafd..32734628c1e 100644 --- a/erpnext/accounts/doctype/dunning/dunning.json +++ b/erpnext/accounts/doctype/dunning/dunning.json @@ -185,7 +185,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Address", "read_only": 1 }, @@ -204,7 +204,7 @@ }, { "fieldname": "company_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Company Address Display", "read_only": 1 }, @@ -381,7 +381,7 @@ ], "is_submittable": 1, "links": [], - "modified": "2023-06-15 15:46:53.865712", + "modified": "2024-03-22 16:01:13.231067", "modified_by": "Administrator", "module": "Accounts", "name": "Dunning", diff --git a/erpnext/accounts/doctype/dunning/dunning.py b/erpnext/accounts/doctype/dunning/dunning.py index e3897bf4aa1..f7c4d90b4bd 100644 --- a/erpnext/accounts/doctype/dunning/dunning.py +++ b/erpnext/accounts/doctype/dunning/dunning.py @@ -32,14 +32,14 @@ class Dunning(AccountsController): from erpnext.accounts.doctype.overdue_payment.overdue_payment import OverduePayment - address_display: DF.SmallText | None + address_display: DF.TextEditor | None amended_from: DF.Link | None base_dunning_amount: DF.Currency body_text: DF.TextEditor | None closing_text: DF.TextEditor | None company: DF.Link company_address: DF.Link | None - company_address_display: DF.SmallText | None + company_address_display: DF.TextEditor | None contact_display: DF.SmallText | None contact_email: DF.Data | None contact_mobile: DF.SmallText | None diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json index d7b173667ec..467ea54c70a 100644 --- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json +++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json @@ -420,7 +420,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Address", "read_only": 1 }, @@ -475,7 +475,7 @@ }, { "fieldname": "shipping_address", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Shipping Address", "print_hide": 1, "read_only": 1 @@ -489,7 +489,7 @@ }, { "fieldname": "company_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hidden": 1, "label": "Company Address", "print_hide": 1, @@ -1563,7 +1563,7 @@ "icon": "fa fa-file-text", "is_submittable": 1, "links": [], - "modified": "2024-03-20 16:00:34.268756", + "modified": "2024-03-22 16:15:08.561034", "modified_by": "Administrator", "module": "Accounts", "name": "POS Invoice", diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py index 5db3da1f5ea..8052c4c5057 100644 --- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py +++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py @@ -47,7 +47,7 @@ class POSInvoice(SalesInvoice): account_for_change_amount: DF.Link | None additional_discount_percentage: DF.Float - address_display: DF.SmallText | None + address_display: DF.TextEditor | None advances: DF.Table[SalesInvoiceAdvance] against_income_account: DF.SmallText | None allocate_advances_automatically: DF.Check @@ -72,7 +72,7 @@ class POSInvoice(SalesInvoice): commission_rate: DF.Float company: DF.Link company_address: DF.Link | None - company_address_display: DF.SmallText | None + company_address_display: DF.TextEditor | None consolidated_invoice: DF.Link | None contact_display: DF.SmallText | None contact_email: DF.Data | None @@ -138,7 +138,7 @@ class POSInvoice(SalesInvoice): selling_price_list: DF.Link set_posting_time: DF.Check set_warehouse: DF.Link | None - shipping_address: DF.SmallText | None + shipping_address: DF.TextEditor | None shipping_address_name: DF.Link | None shipping_rule: DF.Link | None source: DF.Link | None diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index 44d3d48933f..01a3746dcf2 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -443,7 +443,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Address", "read_only": 1 }, @@ -489,7 +489,7 @@ }, { "fieldname": "shipping_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Shipping Address", "print_hide": 1, "read_only": 1 @@ -1363,7 +1363,7 @@ }, { "fieldname": "billing_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Billing Address", "read_only": 1 }, @@ -1638,7 +1638,7 @@ "idx": 204, "is_submittable": 1, "links": [], - "modified": "2024-03-20 15:57:00.736868", + "modified": "2024-03-22 16:15:09.099187", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 19b7092afdf..4b5b456361f 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -82,7 +82,7 @@ class PurchaseInvoice(BuyingController): ) additional_discount_percentage: DF.Float - address_display: DF.SmallText | None + address_display: DF.TextEditor | None advance_tax: DF.Table[AdvanceTax] advances: DF.Table[PurchaseInvoiceAdvance] against_expense_account: DF.SmallText | None @@ -107,7 +107,7 @@ class PurchaseInvoice(BuyingController): bill_date: DF.Date | None bill_no: DF.Data | None billing_address: DF.Link | None - billing_address_display: DF.SmallText | None + billing_address_display: DF.TextEditor | None buying_price_list: DF.Link | None cash_bank_account: DF.Link | None clearance_date: DF.Date | None @@ -174,7 +174,7 @@ class PurchaseInvoice(BuyingController): set_posting_time: DF.Check set_warehouse: DF.Link | None shipping_address: DF.Link | None - shipping_address_display: DF.SmallText | None + shipping_address_display: DF.TextEditor | None shipping_rule: DF.Link | None status: DF.Literal[ "", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index cffb097f4cf..436f5105629 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -495,7 +495,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hide_days": 1, "hide_seconds": 1, "label": "Address", @@ -566,7 +566,7 @@ }, { "fieldname": "shipping_address", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hide_days": 1, "hide_seconds": 1, "label": "Shipping Address", @@ -584,7 +584,7 @@ }, { "fieldname": "company_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hide_days": 1, "hide_seconds": 1, "label": "Company Address", @@ -1999,7 +1999,7 @@ { "allow_on_submit": 1, "fieldname": "dispatch_address", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Dispatch Address", "read_only": 1 }, @@ -2256,4 +2256,4 @@ "title_field": "title", "track_changes": 1, "track_seen": 1 -} \ No newline at end of file +} diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index aa0048df019..a35c6b6fc11 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -77,7 +77,7 @@ class SalesInvoice(SellingController): account_for_change_amount: DF.Link | None additional_discount_account: DF.Link | None additional_discount_percentage: DF.Float - address_display: DF.SmallText | None + address_display: DF.TextEditor | None advances: DF.Table[SalesInvoiceAdvance] against_income_account: DF.SmallText | None allocate_advances_automatically: DF.Check @@ -102,7 +102,7 @@ class SalesInvoice(SellingController): commission_rate: DF.Float company: DF.Link company_address: DF.Link | None - company_address_display: DF.SmallText | None + company_address_display: DF.TextEditor | None company_tax_id: DF.Data | None contact_display: DF.SmallText | None contact_email: DF.Data | None @@ -119,7 +119,7 @@ class SalesInvoice(SellingController): debit_to: DF.Link disable_rounded_total: DF.Check discount_amount: DF.Currency - dispatch_address: DF.SmallText | None + dispatch_address: DF.TextEditor | None dispatch_address_name: DF.Link | None dont_create_loyalty_points: DF.Check due_date: DF.Date | None @@ -183,7 +183,7 @@ class SalesInvoice(SellingController): set_posting_time: DF.Check set_target_warehouse: DF.Link | None set_warehouse: DF.Link | None - shipping_address: DF.SmallText | None + shipping_address: DF.TextEditor | None shipping_address_name: DF.Link | None shipping_rule: DF.Link | None source: DF.Link | None diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 0916ff5f8d0..1ee97942a8c 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -355,7 +355,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Supplier Address Details", "read_only": 1 }, @@ -394,7 +394,7 @@ }, { "fieldname": "shipping_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Shipping Address Details", "print_hide": 1, "read_only": 1 @@ -1098,7 +1098,7 @@ }, { "fieldname": "billing_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Billing Address Details", "read_only": 1 }, @@ -1288,7 +1288,7 @@ "idx": 105, "is_submittable": 1, "links": [], - "modified": "2024-03-20 16:03:31.611808", + "modified": "2024-03-22 16:15:09.674963", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 4f24ec2acc2..e462820350b 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -55,7 +55,7 @@ class PurchaseOrder(BuyingController): ) additional_discount_percentage: DF.Float - address_display: DF.SmallText | None + address_display: DF.TextEditor | None advance_paid: DF.Currency advance_payment_status: DF.Literal["Not Initiated", "Initiated", "Partially Paid", "Fully Paid"] amended_from: DF.Link | None @@ -74,7 +74,7 @@ class PurchaseOrder(BuyingController): base_total: DF.Currency base_total_taxes_and_charges: DF.Currency billing_address: DF.Link | None - billing_address_display: DF.SmallText | None + billing_address_display: DF.TextEditor | None buying_price_list: DF.Link | None company: DF.Link contact_display: DF.SmallText | None @@ -131,7 +131,7 @@ class PurchaseOrder(BuyingController): set_reserve_warehouse: DF.Link | None set_warehouse: DF.Link | None shipping_address: DF.Link | None - shipping_address_display: DF.SmallText | None + shipping_address_display: DF.TextEditor | None shipping_rule: DF.Link | None status: DF.Literal[ "", diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json index fd73f77ff8f..f386b64ea0e 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -303,7 +303,7 @@ }, { "fieldname": "billing_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Billing Address Details", "read_only": 1 } @@ -312,7 +312,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2023-11-06 12:45:28.898706", + "modified": "2024-03-22 16:01:19.097788", "modified_by": "Administrator", "module": "Buying", "name": "Request for Quotation", diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py index f261773b814..fb4dc6ae53e 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py @@ -40,7 +40,7 @@ class RequestforQuotation(BuyingController): amended_from: DF.Link | None billing_address: DF.Link | None - billing_address_display: DF.SmallText | None + billing_address_display: DF.TextEditor | None company: DF.Link email_template: DF.Link | None incoterm: DF.Link | None diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index 09be247b363..993cde0ab61 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -228,7 +228,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Address", "read_only": 1 }, @@ -865,7 +865,7 @@ }, { "fieldname": "shipping_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Shipping Address Details", "print_hide": 1, "read_only": 1 @@ -897,7 +897,7 @@ }, { "fieldname": "billing_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Billing Address Details", "read_only": 1 }, @@ -928,7 +928,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-03-20 16:03:59.069145", + "modified": "2024-03-22 16:15:10.122197", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation", diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py index b716f7f0427..52bd83bfd2c 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py @@ -31,7 +31,7 @@ class SupplierQuotation(BuyingController): ) additional_discount_percentage: DF.Float - address_display: DF.SmallText | None + address_display: DF.TextEditor | None amended_from: DF.Link | None apply_discount_on: DF.Literal["", "Grand Total", "Net Total"] auto_repeat: DF.Link | None @@ -46,7 +46,7 @@ class SupplierQuotation(BuyingController): base_total: DF.Currency base_total_taxes_and_charges: DF.Currency billing_address: DF.Link | None - billing_address_display: DF.SmallText | None + billing_address_display: DF.TextEditor | None buying_price_list: DF.Link | None company: DF.Link contact_display: DF.SmallText | None @@ -81,7 +81,7 @@ class SupplierQuotation(BuyingController): rounding_adjustment: DF.Currency select_print_heading: DF.Link | None shipping_address: DF.Link | None - shipping_address_display: DF.SmallText | None + shipping_address_display: DF.TextEditor | None shipping_rule: DF.Link | None status: DF.Literal["", "Draft", "Submitted", "Stopped", "Cancelled", "Expired"] supplier: DF.Link diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json index 07641d20c33..e6f7bfcb065 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.json +++ b/erpnext/crm/doctype/opportunity/opportunity.json @@ -250,7 +250,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hidden": 1, "label": "Address", "oldfieldname": "address", @@ -622,7 +622,7 @@ "icon": "fa fa-info-sign", "idx": 195, "links": [], - "modified": "2022-10-13 12:42:21.545636", + "modified": "2024-03-22 16:01:10.721453", "modified_by": "Administrator", "module": "CRM", "name": "Opportunity", diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py index 72e26de70e6..7abbb63df5f 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.py +++ b/erpnext/crm/doctype/opportunity/opportunity.py @@ -40,7 +40,7 @@ class Opportunity(TransactionBase, CRMNote): OpportunityLostReasonDetail, ) - address_display: DF.SmallText | None + address_display: DF.TextEditor | None amended_from: DF.Link | None annual_revenue: DF.Currency base_opportunity_amount: DF.Currency diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json index 08026d031f2..e773d664eb5 100644 --- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json +++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json @@ -187,7 +187,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hidden": 1, "label": "Address", "read_only": 1 @@ -238,7 +238,7 @@ "link_fieldname": "maintenance_schedule" } ], - "modified": "2023-06-03 16:15:43.958072", + "modified": "2024-03-22 16:01:11.868813", "modified_by": "Administrator", "module": "Maintenance", "name": "Maintenance Schedule", diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py index 75d890c08db..50ec1f2795f 100644 --- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py @@ -26,7 +26,7 @@ class MaintenanceSchedule(TransactionBase): MaintenanceScheduleItem, ) - address_display: DF.SmallText | None + address_display: DF.TextEditor | None amended_from: DF.Link | None company: DF.Link contact_display: DF.SmallText | None diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json index b0d5cb89964..6124b6f487f 100644 --- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json +++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json @@ -83,7 +83,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hidden": 1, "label": "Address", "read_only": 1 @@ -295,7 +295,7 @@ "idx": 1, "is_submittable": 1, "links": [], - "modified": "2023-06-03 16:19:07.902723", + "modified": "2024-03-22 16:01:12.354826", "modified_by": "Administrator", "module": "Maintenance", "name": "Maintenance Visit", diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py index d2511b8cbc0..b43b419ab3d 100644 --- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py @@ -22,7 +22,7 @@ class MaintenanceVisit(TransactionBase): MaintenanceVisitPurpose, ) - address_display: DF.SmallText | None + address_display: DF.TextEditor | None amended_from: DF.Link | None company: DF.Link completion_status: DF.Literal["", "Partially Completed", "Fully Completed"] diff --git a/erpnext/public/scss/erpnext.scss b/erpnext/public/scss/erpnext.scss index 03dd31104e1..3d8ee890203 100644 --- a/erpnext/public/scss/erpnext.scss +++ b/erpnext/public/scss/erpnext.scss @@ -549,6 +549,14 @@ body[data-route="pos"] { justify-content: center; } -.frappe-control[data-fieldname="other_charges_calculation"] .ql-editor { +.frappe-control[data-fieldname="other_charges_calculation"] .ql-editor, +.frappe-control[data-fieldname="address_display"] .ql-editor, +.frappe-control[data-fieldname="shipping_address_display"] .ql-editor, +.frappe-control[data-fieldname="shipping_address"] .ql-editor, +.frappe-control[data-fieldname="dispatch_address"] .ql-editor, +.frappe-control[data-fieldname="source_address_display"] .ql-editor, +.frappe-control[data-fieldname="target_address_display"] .ql-editor, +.frappe-control[data-fieldname="billing_address_display"] .ql-editor, +.frappe-control[data-fieldname="company_address_display"] .ql-editor { white-space: normal; } diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json index 1e22f447667..fc34c73bc17 100644 --- a/erpnext/selling/doctype/installation_note/installation_note.json +++ b/erpnext/selling/doctype/installation_note/installation_note.json @@ -94,7 +94,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hidden": 1, "label": "Address", "read_only": 1 @@ -238,7 +238,7 @@ "idx": 1, "is_submittable": 1, "links": [], - "modified": "2024-02-04 18:20:12.020313", + "modified": "2024-03-22 16:01:13.513355", "modified_by": "Administrator", "module": "Selling", "name": "Installation Note", @@ -271,4 +271,4 @@ "states": [], "timeline_field": "customer", "title_field": "customer_name" -} +} \ No newline at end of file diff --git a/erpnext/selling/doctype/installation_note/installation_note.py b/erpnext/selling/doctype/installation_note/installation_note.py index d1bfd910f93..ac7cd60108d 100644 --- a/erpnext/selling/doctype/installation_note/installation_note.py +++ b/erpnext/selling/doctype/installation_note/installation_note.py @@ -23,7 +23,7 @@ class InstallationNote(TransactionBase): InstallationNoteItem, ) - address_display: DF.SmallText | None + address_display: DF.TextEditor | None amended_from: DF.Link | None company: DF.Link contact_display: DF.SmallText | None @@ -38,6 +38,7 @@ class InstallationNote(TransactionBase): inst_time: DF.Time | None items: DF.Table[InstallationNoteItem] naming_series: DF.Literal["MAT-INS-.YYYY.-"] + project: DF.Link | None remarks: DF.SmallText | None status: DF.Literal["Draft", "Submitted", "Cancelled"] territory: DF.Link diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index 982e7326775..bb6e0bdfaa2 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -265,7 +265,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Address", "oldfieldname": "customer_address", "oldfieldtype": "Small Text", @@ -318,7 +318,7 @@ }, { "fieldname": "shipping_address", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Shipping Address", "print_hide": 1, "read_only": 1 @@ -965,7 +965,7 @@ }, { "fieldname": "company_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Company Address", "read_only": 1 }, @@ -1073,7 +1073,7 @@ "idx": 82, "is_submittable": 1, "links": [], - "modified": "2024-03-20 16:04:21.567847", + "modified": "2024-03-22 16:15:10.488656", "modified_by": "Administrator", "module": "Selling", "name": "Quotation", diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py index 633e5f56a05..6977f06f868 100644 --- a/erpnext/selling/doctype/quotation/quotation.py +++ b/erpnext/selling/doctype/quotation/quotation.py @@ -34,7 +34,7 @@ class Quotation(SellingController): from erpnext.stock.doctype.packed_item.packed_item import PackedItem additional_discount_percentage: DF.Float - address_display: DF.SmallText | None + address_display: DF.TextEditor | None amended_from: DF.Link | None apply_discount_on: DF.Literal["", "Grand Total", "Net Total"] auto_repeat: DF.Link | None @@ -49,7 +49,7 @@ class Quotation(SellingController): campaign: DF.Link | None company: DF.Link company_address: DF.Link | None - company_address_display: DF.SmallText | None + company_address_display: DF.TextEditor | None competitors: DF.TableMultiSelect[CompetitorDetail] contact_display: DF.SmallText | None contact_email: DF.Data | None @@ -93,7 +93,7 @@ class Quotation(SellingController): scan_barcode: DF.Data | None select_print_heading: DF.Link | None selling_price_list: DF.Link - shipping_address: DF.SmallText | None + shipping_address: DF.TextEditor | None shipping_address_name: DF.Link | None shipping_rule: DF.Link | None source: DF.Link | None diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 1fb1ae0c040..8f6ae05fc28 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -369,7 +369,7 @@ { "allow_on_submit": 1, "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hide_days": 1, "hide_seconds": 1, "label": "Address", @@ -415,7 +415,7 @@ }, { "fieldname": "company_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hide_days": 1, "hide_seconds": 1, "label": "Company Address", @@ -450,7 +450,7 @@ { "allow_on_submit": 1, "fieldname": "shipping_address", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hide_days": 1, "hide_seconds": 1, "label": "Shipping Address", @@ -1525,7 +1525,7 @@ "allow_on_submit": 1, "depends_on": "dispatch_address_name", "fieldname": "dispatch_address", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Dispatch Address", "read_only": 1 }, @@ -1657,7 +1657,7 @@ "idx": 105, "is_submittable": 1, "links": [], - "modified": "2024-03-20 16:04:43.627183", + "modified": "2024-03-22 16:15:04.884816", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 28962032d02..826ba1e8782 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -64,7 +64,7 @@ class SalesOrder(SellingController): from erpnext.stock.doctype.packed_item.packed_item import PackedItem additional_discount_percentage: DF.Float - address_display: DF.SmallText | None + address_display: DF.TextEditor | None advance_paid: DF.Currency advance_payment_status: DF.Literal["Not Requested", "Requested", "Partially Paid", "Fully Paid"] amended_from: DF.Link | None @@ -84,7 +84,7 @@ class SalesOrder(SellingController): commission_rate: DF.Float company: DF.Link company_address: DF.Link | None - company_address_display: DF.SmallText | None + company_address_display: DF.TextEditor | None contact_display: DF.SmallText | None contact_email: DF.Data | None contact_mobile: DF.SmallText | None @@ -104,7 +104,7 @@ class SalesOrder(SellingController): ] disable_rounded_total: DF.Check discount_amount: DF.Currency - dispatch_address: DF.SmallText | None + dispatch_address: DF.TextEditor | None dispatch_address_name: DF.Link | None from_date: DF.Date | None grand_total: DF.Currency @@ -147,7 +147,7 @@ class SalesOrder(SellingController): select_print_heading: DF.Link | None selling_price_list: DF.Link set_warehouse: DF.Link | None - shipping_address: DF.SmallText | None + shipping_address: DF.TextEditor | None shipping_address_name: DF.Link | None shipping_rule: DF.Link | None skip_delivery_note: DF.Check diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index 87c333370b2..d05392dca75 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -351,7 +351,7 @@ }, { "fieldname": "shipping_address", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Shipping Address", "read_only": 1 }, @@ -408,7 +408,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Billing Address", "read_only": 1 }, @@ -420,7 +420,7 @@ }, { "fieldname": "company_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Company Address", "read_only": 1 }, @@ -1289,7 +1289,7 @@ { "depends_on": "dispatch_address_name", "fieldname": "dispatch_address", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Dispatch Address", "print_hide": 1, "read_only": 1 @@ -1397,7 +1397,7 @@ "idx": 146, "is_submittable": 1, "links": [], - "modified": "2024-03-20 16:05:02.854990", + "modified": "2024-03-22 16:15:07.253135", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index e17a0a2307f..f13353e7032 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -35,7 +35,7 @@ class DeliveryNote(SellingController): from erpnext.stock.doctype.packed_item.packed_item import PackedItem additional_discount_percentage: DF.Float - address_display: DF.SmallText | None + address_display: DF.TextEditor | None amended_from: DF.Link | None amount_eligible_for_commission: DF.Currency apply_discount_on: DF.Literal["", "Grand Total", "Net Total"] @@ -52,7 +52,7 @@ class DeliveryNote(SellingController): commission_rate: DF.Float company: DF.Link company_address: DF.Link | None - company_address_display: DF.SmallText | None + company_address_display: DF.TextEditor | None contact_display: DF.SmallText | None contact_email: DF.Data | None contact_mobile: DF.SmallText | None @@ -66,7 +66,7 @@ class DeliveryNote(SellingController): customer_name: DF.Data | None disable_rounded_total: DF.Check discount_amount: DF.Currency - dispatch_address: DF.SmallText | None + dispatch_address: DF.TextEditor | None dispatch_address_name: DF.Link | None driver: DF.Link | None driver_name: DF.Data | None @@ -117,7 +117,7 @@ class DeliveryNote(SellingController): set_posting_time: DF.Check set_target_warehouse: DF.Link | None set_warehouse: DF.Link | None - shipping_address: DF.SmallText | None + shipping_address: DF.TextEditor | None shipping_address_name: DF.Link | None shipping_rule: DF.Link | None source: DF.Link | None diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index b926e9826eb..a0c6ec37e8b 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -313,7 +313,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Address", "read_only": 1 }, @@ -352,7 +352,7 @@ }, { "fieldname": "shipping_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Shipping Address", "print_hide": 1, "read_only": 1 @@ -1095,7 +1095,7 @@ }, { "fieldname": "billing_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Billing Address", "read_only": 1 }, @@ -1252,7 +1252,7 @@ "idx": 261, "is_submittable": 1, "links": [], - "modified": "2024-03-20 16:05:31.713453", + "modified": "2024-03-22 16:15:10.937188", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt", diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index 034dd0a799c..e87e20d33b6 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -40,7 +40,7 @@ class PurchaseReceipt(BuyingController): from erpnext.stock.doctype.purchase_receipt_item.purchase_receipt_item import PurchaseReceiptItem additional_discount_percentage: DF.Float - address_display: DF.SmallText | None + address_display: DF.TextEditor | None amended_from: DF.Link | None apply_discount_on: DF.Literal["", "Grand Total", "Net Total"] apply_putaway_rule: DF.Check @@ -56,7 +56,7 @@ class PurchaseReceipt(BuyingController): base_total: DF.Currency base_total_taxes_and_charges: DF.Currency billing_address: DF.Link | None - billing_address_display: DF.SmallText | None + billing_address_display: DF.TextEditor | None buying_price_list: DF.Link | None company: DF.Link contact_display: DF.SmallText | None @@ -109,7 +109,7 @@ class PurchaseReceipt(BuyingController): set_posting_time: DF.Check set_warehouse: DF.Link | None shipping_address: DF.Link | None - shipping_address_display: DF.SmallText | None + shipping_address_display: DF.TextEditor | None shipping_rule: DF.Link | None status: DF.Literal["", "Draft", "To Bill", "Completed", "Return Issued", "Cancelled", "Closed"] subcontracting_receipt: DF.Link | None diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json index d45296f1310..61e9f254550 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.json +++ b/erpnext/stock/doctype/stock_entry/stock_entry.json @@ -306,7 +306,7 @@ }, { "fieldname": "source_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Source Warehouse Address", "read_only": 1 }, @@ -336,7 +336,7 @@ }, { "fieldname": "target_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Target Warehouse Address", "read_only": 1 }, @@ -464,7 +464,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Address" }, { @@ -681,7 +681,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2024-01-12 11:56:58.644882", + "modified": "2024-03-22 16:23:13.683565", "modified_by": "Administrator", "module": "Stock", "name": "Stock Entry", diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index b75ce2100be..d2dab8a1cc4 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -85,7 +85,7 @@ class StockEntry(StockController): add_to_transit: DF.Check additional_costs: DF.Table[LandedCostTaxesandCharges] - address_display: DF.SmallText | None + address_display: DF.TextEditor | None amended_from: DF.Link | None apply_putaway_rule: DF.Check bom_no: DF.Link | None @@ -127,14 +127,14 @@ class StockEntry(StockController): scan_barcode: DF.Data | None select_print_heading: DF.Link | None set_posting_time: DF.Check - source_address_display: DF.SmallText | None + source_address_display: DF.TextEditor | None source_warehouse_address: DF.Link | None stock_entry_type: DF.Link subcontracting_order: DF.Link | None supplier: DF.Link | None supplier_address: DF.Link | None supplier_name: DF.Data | None - target_address_display: DF.SmallText | None + target_address_display: DF.TextEditor | None target_warehouse_address: DF.Link | None to_warehouse: DF.Link | None total_additional_costs: DF.Currency diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json index 507e23365cc..7cbf7db5251 100644 --- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json +++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json @@ -182,7 +182,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Supplier Address Details", "read_only": 1 }, @@ -230,7 +230,7 @@ }, { "fieldname": "shipping_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Shipping Address Details", "print_hide": 1, "read_only": 1 @@ -243,7 +243,7 @@ }, { "fieldname": "billing_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Billing Address Details", "read_only": 1 }, @@ -454,7 +454,7 @@ "icon": "fa fa-file-text", "is_submittable": 1, "links": [], - "modified": "2024-01-03 20:56:04.670380", + "modified": "2024-03-22 16:15:07.797633", "modified_by": "Administrator", "module": "Subcontracting", "name": "Subcontracting Order", diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py index daccbbbd0f9..321ae517c80 100644 --- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py +++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py @@ -36,10 +36,10 @@ class SubcontractingOrder(SubcontractingController): ) additional_costs: DF.Table[LandedCostTaxesandCharges] - address_display: DF.SmallText | None + address_display: DF.TextEditor | None amended_from: DF.Link | None billing_address: DF.Link | None - billing_address_display: DF.SmallText | None + billing_address_display: DF.TextEditor | None company: DF.Link contact_display: DF.SmallText | None contact_email: DF.SmallText | None @@ -59,7 +59,7 @@ class SubcontractingOrder(SubcontractingController): set_reserve_warehouse: DF.Link | None set_warehouse: DF.Link | None shipping_address: DF.Link | None - shipping_address_display: DF.SmallText | None + shipping_address_display: DF.TextEditor | None status: DF.Literal[ "Draft", "Open", diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json index 383a83b3fcd..8b9cbe39a7b 100644 --- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json +++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json @@ -192,7 +192,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Address", "read_only": 1 }, @@ -231,7 +231,7 @@ }, { "fieldname": "shipping_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Shipping Address", "print_hide": 1, "read_only": 1 @@ -521,7 +521,7 @@ }, { "fieldname": "billing_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Billing Address", "read_only": 1 }, @@ -645,7 +645,7 @@ "in_create": 1, "is_submittable": 1, "links": [], - "modified": "2023-11-16 13:04:00.710534", + "modified": "2024-03-22 16:15:08.074134", "modified_by": "Administrator", "module": "Subcontracting", "name": "Subcontracting Receipt", diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py index 0ffe5c9a2b3..4e2b9c2a3b9 100644 --- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py +++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py @@ -33,13 +33,13 @@ class SubcontractingReceipt(SubcontractingController): ) additional_costs: DF.Table[LandedCostTaxesandCharges] - address_display: DF.SmallText | None + address_display: DF.TextEditor | None amended_from: DF.Link | None auto_repeat: DF.Link | None bill_date: DF.Date | None bill_no: DF.Data | None billing_address: DF.Link | None - billing_address_display: DF.SmallText | None + billing_address_display: DF.TextEditor | None company: DF.Link contact_display: DF.SmallText | None contact_email: DF.SmallText | None @@ -69,7 +69,7 @@ class SubcontractingReceipt(SubcontractingController): set_posting_time: DF.Check set_warehouse: DF.Link | None shipping_address: DF.Link | None - shipping_address_display: DF.SmallText | None + shipping_address_display: DF.TextEditor | None status: DF.Literal["", "Draft", "Completed", "Return", "Return Issued", "Cancelled", "Closed"] supplied_items: DF.Table[SubcontractingReceiptSuppliedItem] supplier: DF.Link diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json index 9af2b4606c9..4ff1bcc8621 100644 --- a/erpnext/support/doctype/warranty_claim/warranty_claim.json +++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json @@ -311,7 +311,7 @@ { "depends_on": "customer", "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Address", "read_only": 1 }, @@ -379,7 +379,7 @@ "icon": "fa fa-bug", "idx": 1, "links": [], - "modified": "2023-11-28 17:30:35.676410", + "modified": "2024-03-22 16:01:11.412114", "modified_by": "Administrator", "module": "Support", "name": "Warranty Claim", diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.py b/erpnext/support/doctype/warranty_claim/warranty_claim.py index e0eb5a3ab88..658be5708df 100644 --- a/erpnext/support/doctype/warranty_claim/warranty_claim.py +++ b/erpnext/support/doctype/warranty_claim/warranty_claim.py @@ -18,7 +18,7 @@ class WarrantyClaim(TransactionBase): if TYPE_CHECKING: from frappe.types import DF - address_display: DF.SmallText | None + address_display: DF.TextEditor | None amc_expiry_date: DF.Date | None amended_from: DF.Link | None company: DF.Link