diff --git a/erpnext/public/js/sales_order_proforma.js b/erpnext/public/js/sales_order_proforma.js index 71d382b23cf..3d24cc22bb2 100644 --- a/erpnext/public/js/sales_order_proforma.js +++ b/erpnext/public/js/sales_order_proforma.js @@ -307,7 +307,7 @@ Object.assign(erpnext.proforma, { frappe.ui .button({ - label: __("New Proforma"), + label: __("New Proforma Invoice"), icon: "plus", variant: "subtle", size: "sm", diff --git a/erpnext/selling/doctype/proforma_invoice/proforma_invoice.js b/erpnext/selling/doctype/proforma_invoice/proforma_invoice.js new file mode 100644 index 00000000000..a8f08572bc5 --- /dev/null +++ b/erpnext/selling/doctype/proforma_invoice/proforma_invoice.js @@ -0,0 +1,8 @@ +// Copyright (c) 2026, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +// frappe.ui.form.on("Proforma Invoice", { +// refresh(frm) { + +// }, +// }); diff --git a/erpnext/selling/doctype/proforma_invoice/proforma_invoice.json b/erpnext/selling/doctype/proforma_invoice/proforma_invoice.json index 14ef90efacb..0a45df89088 100644 --- a/erpnext/selling/doctype/proforma_invoice/proforma_invoice.json +++ b/erpnext/selling/doctype/proforma_invoice/proforma_invoice.json @@ -1,7 +1,7 @@ { "actions": [], "autoname": "naming_series:", - "creation": "2026-07-16 00:00:00.000000", + "creation": "2026-07-16 00:00:00", "doctype": "DocType", "engine": "InnoDB", "field_order": [ @@ -10,9 +10,9 @@ "sales_order", "customer", "customer_name", + "company", "column_break_header", "proforma_date", - "company", "currency", "based_on", "hide_item_qty", @@ -21,6 +21,7 @@ "totals_section", "column_break_totals", "total_qty", + "column_break_fukr", "grand_total", "print_section", "print_format", @@ -231,13 +232,17 @@ "options": "Proforma Invoice", "print_hide": 1, "read_only": 1 + }, + { + "fieldname": "column_break_fukr", + "fieldtype": "Column Break" } ], "in_create": 1, "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2026-07-16 00:00:00.000000", + "modified": "2026-07-19 11:15:50.347119", "modified_by": "Administrator", "module": "Selling", "name": "Proforma Invoice", @@ -273,6 +278,7 @@ "write": 1 } ], + "row_format": "Dynamic", "sort_field": "creation", "sort_order": "DESC", "states": [], diff --git a/erpnext/selling/doctype/proforma_invoice/proforma_invoice.py b/erpnext/selling/doctype/proforma_invoice/proforma_invoice.py index d633c7426d0..ac9d1bc046e 100644 --- a/erpnext/selling/doctype/proforma_invoice/proforma_invoice.py +++ b/erpnext/selling/doctype/proforma_invoice/proforma_invoice.py @@ -18,9 +18,7 @@ class ProformaInvoice(Document): if TYPE_CHECKING: from frappe.types import DF - from erpnext.selling.doctype.proforma_invoice_item.proforma_invoice_item import ( - ProformaInvoiceItem, - ) + from erpnext.selling.doctype.proforma_invoice_item.proforma_invoice_item import ProformaInvoiceItem amended_from: DF.Link | None based_on: DF.Literal["Quantity", "Amount"]