From 93d1716eb53d5a2817a80407cdc4a26674fd9148 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 6 Feb 2026 16:24:53 +0530 Subject: [PATCH] refactor: form cleanup for sales order --- .../doctype/sales_order/sales_order.json | 107 ++++++++++-------- 1 file changed, 59 insertions(+), 48 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 609b093bae3..c94fe377512 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -13,16 +13,14 @@ "column_break0", "company", "naming_series", - "order_type", + "customer", + "customer_name", "column_break_7", + "order_type", "transaction_date", "delivery_date", "column_break1", - "customer", - "customer_name", "tax_id", - "po_no", - "po_date", "skip_delivery_note", "has_unit_price_items", "is_subcontracted", @@ -70,19 +68,22 @@ "base_total_taxes_and_charges", "column_break_46", "total_taxes_and_charges", - "totals", - "base_grand_total", - "base_rounding_adjustment", - "base_rounded_total", - "base_in_words", - "column_break3", + "totals_section", "grand_total", - "rounding_adjustment", - "rounded_total", "in_words", - "advance_paid", "disable_rounded_total", - "section_break_48", + "column_break_nuxg", + "rounded_total", + "rounding_adjustment", + "base_totals_section", + "base_grand_total", + "base_in_words", + "column_break_bgfw", + "base_rounded_total", + "base_rounding_adjustment", + "section_break_efew", + "advance_paid", + "additional_discount_section", "apply_discount_on", "base_discount_amount", "coupon_code", @@ -162,6 +163,8 @@ "language", "additional_info_section", "is_internal_customer", + "po_no", + "po_date", "represents_company", "column_break_yvzv", "utm_source", @@ -842,14 +845,6 @@ "print_hide": 1, "read_only": 1 }, - { - "collapsible": 1, - "fieldname": "section_break_48", - "fieldtype": "Section Break", - "hide_days": 1, - "hide_seconds": 1, - "label": "Additional Discount" - }, { "fieldname": "coupon_code", "fieldtype": "Link", @@ -873,7 +868,7 @@ "fieldtype": "Currency", "hide_days": 1, "hide_seconds": 1, - "label": "Additional Discount Amount (Company Currency)", + "label": "Additional Discount Amount", "options": "Company:company:default_currency", "print_hide": 1, "read_only": 1 @@ -901,22 +896,12 @@ "options": "currency", "print_hide": 1 }, - { - "fieldname": "totals", - "fieldtype": "Section Break", - "hide_days": 1, - "hide_seconds": 1, - "label": "Totals", - "oldfieldtype": "Section Break", - "options": "fa fa-money", - "print_hide": 1 - }, { "fieldname": "base_grand_total", "fieldtype": "Currency", "hide_days": 1, "hide_seconds": 1, - "label": "Grand Total (Company Currency)", + "label": "Grand Total", "oldfieldname": "grand_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -930,7 +915,7 @@ "fieldtype": "Currency", "hide_days": 1, "hide_seconds": 1, - "label": "Rounding Adjustment (Company Currency)", + "label": "Rounding Adjustment", "no_copy": 1, "options": "Company:company:default_currency", "print_hide": 1, @@ -942,7 +927,7 @@ "fieldtype": "Currency", "hide_days": 1, "hide_seconds": 1, - "label": "Rounded Total (Company Currency)", + "label": "Rounded Total", "oldfieldname": "rounded_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -956,7 +941,7 @@ "fieldtype": "Data", "hide_days": 1, "hide_seconds": 1, - "label": "In Words (Company Currency)", + "label": "In Words", "length": 240, "oldfieldname": "in_words", "oldfieldtype": "Data", @@ -964,15 +949,6 @@ "read_only": 1, "width": "200px" }, - { - "fieldname": "column_break3", - "fieldtype": "Column Break", - "hide_days": 1, - "hide_seconds": 1, - "oldfieldtype": "Column Break", - "print_hide": 1, - "width": "50%" - }, { "fieldname": "grand_total", "fieldtype": "Currency", @@ -1706,6 +1682,41 @@ "no_copy": 1, "options": "Item Wise Tax Detail", "print_hide": 1 + }, + { + "fieldname": "totals_section", + "fieldtype": "Section Break", + "hide_days": 1, + "hide_seconds": 1, + "label": "Totals", + "oldfieldtype": "Section Break", + "options": "fa fa-money", + "print_hide": 1 + }, + { + "fieldname": "base_totals_section", + "fieldtype": "Section Break", + "label": "Totals (Company Currency)" + }, + { + "fieldname": "column_break_nuxg", + "fieldtype": "Column Break" + }, + { + "fieldname": "column_break_bgfw", + "fieldtype": "Column Break" + }, + { + "fieldname": "section_break_efew", + "fieldtype": "Section Break" + }, + { + "collapsible": 1, + "fieldname": "additional_discount_section", + "fieldtype": "Section Break", + "hide_days": 1, + "hide_seconds": 1, + "label": "Additional Discount" } ], "grid_page_length": 50, @@ -1713,7 +1724,7 @@ "idx": 105, "is_submittable": 1, "links": [], - "modified": "2026-02-06 11:06:16.092658", + "modified": "2026-02-06 15:35:47.502692", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order",