diff --git a/erpnext/accounts/doctype/dunning/dunning.json b/erpnext/accounts/doctype/dunning/dunning.json index 8222c353045c89676bb0498427678198f51a8059..55261d839b7ecb00bdcc2dc48058d8a767d9b410 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-12-08 16:03:01.935070", + "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 b198759e13d2e391cde8f117e3aae0382252db70..f7c4d90b4bdb42697195ac320577921c5c0b3d3e 100644 --- a/erpnext/accounts/doctype/dunning/dunning.py +++ b/erpnext/accounts/doctype/dunning/dunning.py @@ -22,6 +22,52 @@ from erpnext.controllers.accounts_controller import AccountsController class Dunning(AccountsController): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + from erpnext.accounts.doctype.overdue_payment.overdue_payment import OverduePayment + + 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.TextEditor | None + contact_display: DF.SmallText | None + contact_email: DF.Data | None + contact_mobile: DF.SmallText | None + contact_person: DF.Link | None + conversion_rate: DF.Float + cost_center: DF.Link | None + currency: DF.Link | None + customer: DF.Link + customer_address: DF.Link | None + customer_name: DF.Data | None + dunning_amount: DF.Currency + dunning_fee: DF.Currency + dunning_type: DF.Link | None + grand_total: DF.Currency + income_account: DF.Link | None + language: DF.Link | None + letter_head: DF.Link | None + naming_series: DF.Literal["DUNN-.MM.-.YY.-"] + overdue_payments: DF.Table[OverduePayment] + posting_date: DF.Date + posting_time: DF.Time | None + rate_of_interest: DF.Float + spacer: DF.Data | None + status: DF.Literal["Draft", "Resolved", "Unresolved", "Cancelled"] + total_interest: DF.Currency + total_outstanding: DF.Currency + # end: auto-generated types + def validate(self): self.validate_same_currency() self.validate_overdue_payments() diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json index 818e1a7ec2eff7101ea30752a288228f476c2283..ea0e94f16c2e215b3a644fef4b0ea8c627696943 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, @@ -1564,7 +1564,7 @@ "is_sealed": 1, "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 8f0cfcf491bdc55422360d3bef4a893c02896f0f..f9d52290f8026665e853cb460bf9fb8f9df34600 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 9809b17fa6c0b6ab782a7df6896834f74b4fe880..ec00feecbac85e0c0b352d447798038046bd9a6c 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -435,7 +435,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Address", "read_only": 1 }, @@ -481,7 +481,7 @@ }, { "fieldname": "shipping_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Shipping Address", "print_hide": 1, "read_only": 1 @@ -1385,7 +1385,7 @@ }, { "fieldname": "billing_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Billing Address", "read_only": 1 }, @@ -1660,8 +1660,8 @@ "link_doctype": "Payment Request", "link_fieldname": "reference_name" } - ], - "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 9899313778c23ac45b267d5c271df00f89ac29bb..ca337698e8adf9c70950cd80b8e029f242f92be7 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -83,7 +83,7 @@ class PurchaseInvoice(BuyingController): accounting_journal: DF.Link | None 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 @@ -108,7 +108,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 @@ -176,7 +176,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 50cd22bedf685b10a07a1989cbea9eb7c31852a5..c3cf03e2e165a5cb29e94e75be565c908d406665 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -455,7 +455,9 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", + "hide_days": 1, + "hide_seconds": 1, "label": "Address", "read_only": 1 }, @@ -510,7 +512,9 @@ }, { "fieldname": "shipping_address", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", + "hide_days": 1, + "hide_seconds": 1, "label": "Shipping Address", "print_hide": 1, "read_only": 1 @@ -524,7 +528,9 @@ }, { "fieldname": "company_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", + "hide_days": 1, + "hide_seconds": 1, "label": "Company Address", "print_hide": 1, "read_only": 1 @@ -1726,7 +1732,7 @@ { "allow_on_submit": 1, "fieldname": "dispatch_address", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Dispatch Address", "read_only": 1 }, diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index c5c7a58ced5dddfbd80c2e93fafb11d129f8ed82..db33873700f547b02b01c12d991173b5aaf81945 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -78,7 +78,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 @@ -103,7 +103,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 ed24be084ba5602ca6c81c5fcc0f92b56e6ab129..694e4928e7b8e951ccc9333e687be668f79713bd 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -354,7 +354,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Supplier Address Details", "read_only": 1 }, @@ -393,7 +393,7 @@ }, { "fieldname": "shipping_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Shipping Address Details", "print_hide": 1, "read_only": 1 @@ -1097,7 +1097,7 @@ }, { "fieldname": "billing_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Billing Address Details", "read_only": 1 }, @@ -1275,7 +1275,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 7a1c4bd154ae10ee41295f4ed21ccdb05fabf8e1..1b8cd03474c1562954619ce3f1531565be9e8bcf 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -56,7 +56,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 @@ -75,7 +75,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 @@ -132,7 +132,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 ff33882e6c047913368c5f9dd7135b7645f9a787..25b076a9286d5d147620c1fd1f74e1ac8a44df91 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 60d2f2de4f7985a92e645d8d61dddceee7495183..af063440b8eb23ab5791f1bc2545738074b92d82 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py @@ -22,6 +22,45 @@ STANDARD_USERS = ("Guest", "Administrator") class RequestforQuotation(BuyingController): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + from erpnext.buying.doctype.request_for_quotation_item.request_for_quotation_item import ( + RequestforQuotationItem, + ) + from erpnext.buying.doctype.request_for_quotation_supplier.request_for_quotation_supplier import ( + RequestforQuotationSupplier, + ) + + amended_from: DF.Link | None + billing_address: DF.Link | None + billing_address_display: DF.TextEditor | None + company: DF.Link + email_template: DF.Link | None + incoterm: DF.Link | None + items: DF.Table[RequestforQuotationItem] + letter_head: DF.Link | None + message_for_supplier: DF.TextEditor + named_place: DF.Data | None + naming_series: DF.Literal["PUR-RFQ-.YYYY.-"] + opportunity: DF.Link | None + schedule_date: DF.Date | None + select_print_heading: DF.Link | None + send_attached_files: DF.Check + send_document_print: DF.Check + status: DF.Literal["", "Draft", "Submitted", "Cancelled"] + suppliers: DF.Table[RequestforQuotationSupplier] + tc_name: DF.Link | None + terms: DF.TextEditor | None + transaction_date: DF.Date + vendor: DF.Link | None + # end: auto-generated types + def validate(self): self.validate_duplicate_supplier() self.validate_supplier_list() diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index 90002fcf52683cab36d129837688b8107aebe595..18b195b217215581ec9d3c2fe407f1150befb020 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 02b1e98b6021b8b97cf1052167f08590b33ffa25..4fd008ccda5afe30fb52d84087fd9b6c5c181975 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 76b3bf810a7b2406af6c7ddd37201aa2f8c76f89..dc9289f148461a86d1d04b7545d8ea0c7905c13c 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.json +++ b/erpnext/crm/doctype/opportunity/opportunity.json @@ -248,7 +248,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hidden": 1, "label": "Address", "oldfieldname": "address", @@ -620,7 +620,7 @@ "icon": "uil uil-user-exclamation", "idx": 195, "links": [], - "modified": "2023-02-24 16:58:02.031257", + "modified": "2024-03-22 16:01:10.721453", "modified_by": "Administrator", "module": "CRM", "name": "Opportunity", @@ -664,4 +664,4 @@ "title_field": "title", "track_seen": 1, "track_views": 1 -} \ No newline at end of file +} diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py index b5ca82484a8c6be294d37b2835e7b615f0383156..45c6e934b4bc3fea878dc852375f627d354bfc0c 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.py +++ b/erpnext/crm/doctype/opportunity/opportunity.py @@ -25,6 +25,72 @@ from erpnext.utilities.transaction_base import TransactionBase class Opportunity(TransactionBase, CRMNote): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + from erpnext.crm.doctype.competitor_detail.competitor_detail import CompetitorDetail + from erpnext.crm.doctype.crm_note.crm_note import CRMNote + from erpnext.crm.doctype.opportunity_item.opportunity_item import OpportunityItem + from erpnext.crm.doctype.opportunity_lost_reason_detail.opportunity_lost_reason_detail import ( + OpportunityLostReasonDetail, + ) + + address_display: DF.TextEditor | None + amended_from: DF.Link | None + annual_revenue: DF.Currency + base_opportunity_amount: DF.Currency + base_total: DF.Currency + campaign: DF.Link | None + city: DF.Data | None + company: DF.Link + competitors: DF.TableMultiSelect[CompetitorDetail] + contact_display: DF.SmallText | None + contact_email: DF.Data | None + contact_mobile: DF.Data | None + contact_person: DF.Link | None + conversion_rate: DF.Float + country: DF.Link | None + currency: DF.Link | None + customer_address: DF.Link | None + customer_group: DF.Link | None + customer_name: DF.Data | None + expected_closing: DF.Date | None + first_response_time: DF.Duration | None + industry: DF.Link | None + items: DF.Table[OpportunityItem] + job_title: DF.Data | None + language: DF.Link | None + lost_reasons: DF.TableMultiSelect[OpportunityLostReasonDetail] + market_segment: DF.Link | None + naming_series: DF.Literal["CRM-OPP-.YYYY.-"] + no_of_employees: DF.Literal["1-10", "11-50", "51-200", "201-500", "501-1000", "1000+"] + notes: DF.Table[CRMNote] + opportunity_amount: DF.Currency + opportunity_from: DF.Link + opportunity_owner: DF.Link | None + opportunity_type: DF.Link | None + order_lost_reason: DF.SmallText | None + party_name: DF.DynamicLink + phone: DF.Data | None + phone_ext: DF.Data | None + probability: DF.Percent + sales_stage: DF.Link | None + source: DF.Link | None + state: DF.Data | None + status: DF.Literal["Open", "Quotation", "Converted", "Lost", "Replied", "Closed"] + territory: DF.Link | None + title: DF.Data | None + total: DF.Currency + transaction_date: DF.Date + website: DF.Data | None + whatsapp: DF.Data | None + # end: auto-generated types + def onload(self): ref_doc = frappe.get_doc(self.opportunity_from, self.party_name) load_address_and_contact(ref_doc) diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json index 9172919ab1aa600ee4f00fed33ecd2baeab6a213..0bb4e2bd2fbd4411a20161aca1c67c34d332c9dd 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 dd0feca6ce291cc0d45d94925028d73164e4ed8e..6a201175a4dce2b081060f373d8747cfd01474d1 100644 --- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py @@ -12,6 +12,40 @@ from erpnext.utilities.transaction_base import TransactionBase, delete_events class MaintenanceSchedule(TransactionBase): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + from erpnext.maintenance.doctype.maintenance_schedule_detail.maintenance_schedule_detail import ( + MaintenanceScheduleDetail, + ) + from erpnext.maintenance.doctype.maintenance_schedule_item.maintenance_schedule_item import ( + MaintenanceScheduleItem, + ) + + address_display: DF.TextEditor | None + amended_from: DF.Link | None + company: DF.Link + contact_display: DF.SmallText | None + contact_email: DF.Data | None + contact_mobile: DF.Data | None + contact_person: DF.Link | None + customer: DF.Link | None + customer_address: DF.Link | None + customer_group: DF.Link | None + customer_name: DF.Data | None + items: DF.Table[MaintenanceScheduleItem] + naming_series: DF.Literal["MAT-MSH-.YYYY.-"] + schedules: DF.Table[MaintenanceScheduleDetail] + status: DF.Literal["", "Draft", "Submitted", "Cancelled"] + territory: DF.Link | None + transaction_date: DF.Date + # end: auto-generated types + @frappe.whitelist() def generate_schedule(self): if self.docstatus != 0: diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json index ba7b683fac979dbbfae0fa2613de1825b2cfdf71..98d02e39d7e34a57031c7b81a50fa7a47a527de9 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 0035fbcbdf7a5c3dab939b0c9b87bd0090342a8d..b43b419ab3dc630533425f8d3b2c68b2bfcfaac2 100644 --- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py @@ -10,6 +10,42 @@ from erpnext.utilities.transaction_base import TransactionBase class MaintenanceVisit(TransactionBase): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + from erpnext.maintenance.doctype.maintenance_visit_purpose.maintenance_visit_purpose import ( + MaintenanceVisitPurpose, + ) + + address_display: DF.TextEditor | None + amended_from: DF.Link | None + company: DF.Link + completion_status: DF.Literal["", "Partially Completed", "Fully Completed"] + contact_display: DF.SmallText | None + contact_email: DF.Data | None + contact_mobile: DF.Data | None + contact_person: DF.Link | None + customer: DF.Link + customer_address: DF.Link | None + customer_feedback: DF.SmallText | None + customer_group: DF.Link | None + customer_name: DF.Data | None + maintenance_schedule: DF.Link | None + maintenance_schedule_detail: DF.Link | None + maintenance_type: DF.Literal["", "Scheduled", "Unscheduled", "Breakdown"] + mntc_date: DF.Date + mntc_time: DF.Time | None + naming_series: DF.Literal["MAT-MVS-.YYYY.-"] + purposes: DF.Table[MaintenanceVisitPurpose] + status: DF.Literal["", "Draft", "Cancelled", "Submitted"] + territory: DF.Link | None + # end: auto-generated types + def validate_serial_no(self): for d in self.get("purposes"): if d.serial_no and not frappe.db.exists("Serial No", d.serial_no): diff --git a/erpnext/public/scss/erpnext.scss b/erpnext/public/scss/erpnext.scss index 5c8aa0b0b64a80bcf4cd73b4961405cc230f4297..1030d1b2f30601655220b8ca9099230e4912d9fb 100644 --- a/erpnext/public/scss/erpnext.scss +++ b/erpnext/public/scss/erpnext.scss @@ -137,6 +137,14 @@ 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 1e22f44766731c390ff21568609250a3b51e52c5..2122752a7cef10961070fe5403900ddc43df67b1 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", diff --git a/erpnext/selling/doctype/installation_note/installation_note.py b/erpnext/selling/doctype/installation_note/installation_note.py index 0ef4754bc68e7aa6092866df1a4813ca51854915..ac7cd60108d87009f9e729039ff0365af9d3fc34 100644 --- a/erpnext/selling/doctype/installation_note/installation_note.py +++ b/erpnext/selling/doctype/installation_note/installation_note.py @@ -11,6 +11,39 @@ from erpnext.utilities.transaction_base import TransactionBase class InstallationNote(TransactionBase): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + from erpnext.selling.doctype.installation_note_item.installation_note_item import ( + InstallationNoteItem, + ) + + address_display: DF.TextEditor | None + amended_from: DF.Link | None + company: DF.Link + contact_display: DF.SmallText | None + contact_email: DF.Data | None + contact_mobile: DF.SmallText | None + contact_person: DF.Link | None + customer: DF.Link + customer_address: DF.Link | None + customer_group: DF.Link | None + customer_name: DF.Data | None + inst_date: DF.Date + 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 + # end: auto-generated types + def __init__(self, *args, **kwargs): super(InstallationNote, self).__init__(*args, **kwargs) self.status_updater = [ diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index 03e3fa2638ba6ba5d82a164879ea1b9c378f00e7..d908f3aff062ae7cfbba3e1d0eee977cec815736 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -270,7 +270,7 @@ }, { "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Address", "oldfieldname": "customer_address", "oldfieldtype": "Small Text", @@ -323,7 +323,7 @@ }, { "fieldname": "shipping_address", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Shipping Address", "print_hide": 1, "read_only": 1 @@ -969,7 +969,7 @@ }, { "fieldname": "company_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Company Address", "read_only": 1 }, @@ -1104,7 +1104,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 10d13305c6971a16272570b8f952a4b4e49c83ca..0436dd86b94d74a8f9a9e2c783f71d8db0bf982f 100644 --- a/erpnext/selling/doctype/quotation/quotation.py +++ b/erpnext/selling/doctype/quotation/quotation.py @@ -33,7 +33,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 @@ -48,7 +48,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 @@ -95,7 +95,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 efc986da6e6d0310a1fda151f077cc4d328f1b1c..d7aedf33538541783aaf9d9489088884010258d0 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -372,7 +372,7 @@ { "allow_on_submit": 1, "fieldname": "address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hide_days": 1, "hide_seconds": 1, "label": "Address", @@ -418,7 +418,7 @@ }, { "fieldname": "company_address_display", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hide_days": 1, "hide_seconds": 1, "label": "Company Address", @@ -453,7 +453,7 @@ { "allow_on_submit": 1, "fieldname": "shipping_address", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "hide_days": 1, "hide_seconds": 1, "label": "Shipping Address", @@ -1526,7 +1526,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 }, @@ -1671,7 +1671,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 98fb9a5f2d2a66e4e5bf78066ce38e8bba947b02..fcedb508db3b95a3c2a957e7f62b72641672b7b1 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -66,7 +66,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 @@ -86,7 +86,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 @@ -106,7 +106,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 @@ -149,7 +149,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 1cd371c8c8812cd8883c79f64c1b708d288d71a1..300715545b5cfad857d3e4d57d0752e3ab8c0020 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 }, @@ -1287,7 +1287,7 @@ { "depends_on": "dispatch_address_name", "fieldname": "dispatch_address", - "fieldtype": "Small Text", + "fieldtype": "Text Editor", "label": "Dispatch Address", "print_hide": 1, "read_only": 1 @@ -1395,7 +1395,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 0ed4089d39d01f47e7d407bd2e67ea8c1b65d3ff..da98a8a9d94127bf5bc378342e7ea113b80f4b89 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -36,7 +36,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"] @@ -53,7 +53,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 @@ -67,7 +67,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 @@ -118,7 +118,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 7a5dd6d20b8ffbc30038cb52ba06b6f09051472b..38bc1d11a068d14b527d85ccc4407bc69ea903bd 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 487989bfb17841bf25f69dce75b743f899b0319d..8609cf5dc61812dbc82f48313a4ba9be013a7769 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 6c9eaa6fd7beb15084842b0d3a65b2de23816d43..63b3c868988f38116f0b762a558a6eb852ead972 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 846825b61ad07d575464c3d35cc071c84d65cc19..2e086332743821ae304d16fafb368181039da687 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -70,6 +70,82 @@ form_grid_templates = {"items": "templates/form_grid/stock_entry_grid.html"} class StockEntry(StockController): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + from erpnext.stock.doctype.landed_cost_taxes_and_charges.landed_cost_taxes_and_charges import ( + LandedCostTaxesandCharges, + ) + from erpnext.stock.doctype.stock_entry_detail.stock_entry_detail import StockEntryDetail + + add_to_transit: DF.Check + additional_costs: DF.Table[LandedCostTaxesandCharges] + address_display: DF.TextEditor | None + amended_from: DF.Link | None + apply_putaway_rule: DF.Check + bom_no: DF.Link | None + company: DF.Link + credit_note: DF.Link | None + delivery_note_no: DF.Link | None + fg_completed_qty: DF.Float + from_bom: DF.Check + from_warehouse: DF.Link | None + inspection_required: DF.Check + is_opening: DF.Literal["No", "Yes"] + is_return: DF.Check + items: DF.Table[StockEntryDetail] + job_card: DF.Link | None + letter_head: DF.Link | None + naming_series: DF.Literal["MAT-STE-.YYYY.-"] + outgoing_stock_entry: DF.Link | None + per_transferred: DF.Percent + pick_list: DF.Link | None + posting_date: DF.Date | None + posting_time: DF.Time | None + process_loss_percentage: DF.Percent + process_loss_qty: DF.Float + project: DF.Link | None + purchase_order: DF.Link | None + purchase_receipt_no: DF.Link | None + purpose: DF.Literal[ + "Material Issue", + "Material Receipt", + "Material Transfer", + "Material Transfer for Manufacture", + "Material Consumption for Manufacture", + "Manufacture", + "Repack", + "Send to Subcontractor", + ] + remarks: DF.Text | None + sales_invoice_no: DF.Link | None + scan_barcode: DF.Data | None + select_print_heading: DF.Link | None + set_posting_time: DF.Check + 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.TextEditor | None + target_warehouse_address: DF.Link | None + to_warehouse: DF.Link | None + total_additional_costs: DF.Currency + total_amount: DF.Currency + total_incoming_value: DF.Currency + total_outgoing_value: DF.Currency + use_multi_level_bom: DF.Check + value_difference: DF.Currency + work_order: DF.Link | None + # end: auto-generated types + def __init__(self, *args, **kwargs): super(StockEntry, self).__init__(*args, **kwargs) if self.purchase_order: diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json index 6dc9c3dde8a3266abffa50d294d14233d056af69..384203d574271387747897b06898e316bf1c04de 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 daccbbbd0f9bd94a22c4fdbea9d53fd182eab825..321ae517c80f490fe6ea807c9cf1305ee1b19c69 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 1b080ead24fd3daca7b2315558b78382405d13bd..85b4fe47c15d3e661c034f9103dc94edfe0ec6c4 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 3ce6b229fe2ff6ba3cdaf288cb470b42290556f0..4e2b9c2a3b9221f292f25b6d85ff15363a586a56 100644 --- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py +++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py @@ -14,6 +14,76 @@ from erpnext.stock.stock_ledger import get_valuation_rate class SubcontractingReceipt(SubcontractingController): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + from erpnext.stock.doctype.landed_cost_taxes_and_charges.landed_cost_taxes_and_charges import ( + LandedCostTaxesandCharges, + ) + from erpnext.subcontracting.doctype.subcontracting_receipt_item.subcontracting_receipt_item import ( + SubcontractingReceiptItem, + ) + from erpnext.subcontracting.doctype.subcontracting_receipt_supplied_item.subcontracting_receipt_supplied_item import ( + SubcontractingReceiptSuppliedItem, + ) + + additional_costs: DF.Table[LandedCostTaxesandCharges] + 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.TextEditor | None + company: DF.Link + contact_display: DF.SmallText | None + contact_email: DF.SmallText | None + contact_mobile: DF.SmallText | None + contact_person: DF.Link | None + cost_center: DF.Link | None + distribute_additional_costs_based_on: DF.Literal["Qty", "Amount"] + in_words: DF.Data | None + instructions: DF.SmallText | None + is_return: DF.Check + items: DF.Table[SubcontractingReceiptItem] + language: DF.Data | None + letter_head: DF.Link | None + lr_date: DF.Date | None + lr_no: DF.Data | None + naming_series: DF.Literal["MAT-SCR-.YYYY.-", "MAT-SCR-RET-.YYYY.-"] + per_returned: DF.Percent + posting_date: DF.Date + posting_time: DF.Time + project: DF.Link | None + range: DF.Data | None + rejected_warehouse: DF.Link | None + remarks: DF.SmallText | None + represents_company: DF.Link | None + return_against: DF.Link | None + select_print_heading: DF.Link | None + set_posting_time: DF.Check + set_warehouse: DF.Link | None + shipping_address: DF.Link | 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 + supplier_address: DF.Link | None + supplier_delivery_note: DF.Data | None + supplier_name: DF.Data | None + supplier_warehouse: DF.Link | None + title: DF.Data | None + total: DF.Currency + total_additional_costs: DF.Currency + total_qty: DF.Float + transporter_name: DF.Data | None + # end: auto-generated types + def __init__(self, *args, **kwargs): super(SubcontractingReceipt, self).__init__(*args, **kwargs) self.status_updater = [ diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json index 176d18c6d3d29d011837706d0a686d4b68323ee1..92b101acdb906763a6e1c76f18d02fb5b15fa81d 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 ff63b77f9ed880bcb0f1dd556e43ac801d966aa4..658be5708df5d977c3c2588cece59324872e91a7 100644 --- a/erpnext/support/doctype/warranty_claim/warranty_claim.py +++ b/erpnext/support/doctype/warranty_claim/warranty_claim.py @@ -10,6 +10,47 @@ from erpnext.utilities.transaction_base import TransactionBase class WarrantyClaim(TransactionBase): + # begin: auto-generated types + # This code is auto-generated. Do not modify anything in this block. + + from typing import TYPE_CHECKING + + if TYPE_CHECKING: + from frappe.types import DF + + address_display: DF.TextEditor | None + amc_expiry_date: DF.Date | None + amended_from: DF.Link | None + company: DF.Link + complaint: DF.TextEditor + complaint_date: DF.Date + complaint_raised_by: DF.Data | None + contact_display: DF.SmallText | None + contact_email: DF.Data | None + contact_mobile: DF.Data | None + contact_person: DF.Link | None + customer: DF.Link + customer_address: DF.Link | None + customer_group: DF.Link | None + customer_name: DF.Data | None + description: DF.SmallText | None + from_company: DF.Data | None + item_code: DF.Link | None + item_name: DF.Data | None + naming_series: DF.Literal["SER-WRN-.YYYY.-"] + resolution_date: DF.Datetime | None + resolution_details: DF.Text | None + resolved_by: DF.Link | None + serial_no: DF.Link | None + service_address: DF.SmallText | None + status: DF.Literal["", "Open", "Closed", "Work In Progress", "Cancelled"] + territory: DF.Link | None + warranty_amc_status: DF.Literal[ + "", "Under Warranty", "Out of Warranty", "Under AMC", "Out of AMC" + ] + warranty_expiry_date: DF.Date | None + # end: auto-generated types + def validate(self): if session["user"] != "Guest" and not self.customer: frappe.throw(_("Customer is required"))