fix: sales and purchase modules forms clean-up (backport #52875) (#52911)

* fix: sales and purchase modules forms clean-up

(cherry picked from commit 0e356dc2e3)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json

* chore: fix conflicts

* chore: fix conflicts

Removed unnecessary fields and updated the modified date.

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

Removed UTM Analytics section and column break from delivery note JSON configuration. Updated the modified timestamp.

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot]
2026-02-24 11:28:34 +05:30
committed by GitHub
parent 3663fc4f64
commit 217709836b
6 changed files with 68 additions and 46 deletions

View File

@@ -86,18 +86,18 @@
"taxes_and_charges_deducted", "taxes_and_charges_deducted",
"total_taxes_and_charges", "total_taxes_and_charges",
"totals_section", "totals_section",
"use_company_roundoff_cost_center",
"grand_total", "grand_total",
"in_words",
"column_break8",
"disable_rounded_total", "disable_rounded_total",
"rounding_adjustment", "rounding_adjustment",
"column_break8",
"use_company_roundoff_cost_center",
"in_words",
"rounded_total", "rounded_total",
"base_totals_section", "base_totals_section",
"base_grand_total", "base_grand_total",
"base_rounding_adjustment",
"column_break_hcca",
"base_in_words", "base_in_words",
"column_break_hcca",
"base_rounding_adjustment",
"base_rounded_total", "base_rounded_total",
"section_break_ttrv", "section_break_ttrv",
"total_advance", "total_advance",
@@ -1689,7 +1689,7 @@
"idx": 204, "idx": 204,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2026-02-05 21:45:16.964500", "modified": "2026-02-23 14:23:57.269770",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

View File

@@ -78,21 +78,23 @@
"column_break_47", "column_break_47",
"total_taxes_and_charges", "total_taxes_and_charges",
"totals_section", "totals_section",
"use_company_roundoff_cost_center",
"grand_total", "grand_total",
"rounding_adjustment",
"in_words", "in_words",
"column_break5", "column_break5",
"rounded_total",
"disable_rounded_total", "disable_rounded_total",
"total_advance", "rounding_adjustment",
"outstanding_amount", "rounded_total",
"use_company_roundoff_cost_center",
"base_totals_section", "base_totals_section",
"base_grand_total", "base_grand_total",
"base_rounding_adjustment",
"base_in_words", "base_in_words",
"column_break_xjag", "column_break_xjag",
"base_rounding_adjustment",
"base_rounded_total", "base_rounded_total",
"section_break_vacb",
"total_advance",
"column_break_rdks",
"outstanding_amount",
"section_tax_withholding_entry", "section_tax_withholding_entry",
"tax_withholding_group", "tax_withholding_group",
"ignore_tax_withholding_threshold", "ignore_tax_withholding_threshold",
@@ -2303,6 +2305,14 @@
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "fa fa-group", "options": "fa fa-group",
"print_hide": 1 "print_hide": 1
},
{
"fieldname": "section_break_vacb",
"fieldtype": "Section Break"
},
{
"fieldname": "column_break_rdks",
"fieldtype": "Column Break"
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
@@ -2316,7 +2326,7 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
"modified": "2026-02-15 20:43:44.732805", "modified": "2026-02-23 14:29:00.301842",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

View File

@@ -77,16 +77,16 @@
"total_taxes_and_charges", "total_taxes_and_charges",
"totals_section", "totals_section",
"grand_total", "grand_total",
"in_words",
"column_break4",
"disable_rounded_total", "disable_rounded_total",
"rounding_adjustment", "rounding_adjustment",
"column_break4",
"in_words",
"rounded_total", "rounded_total",
"base_totals_section", "base_totals_section",
"base_grand_total", "base_grand_total",
"base_rounding_adjustment",
"column_break_jkoz",
"base_in_words", "base_in_words",
"column_break_jkoz",
"base_rounding_adjustment",
"base_rounded_total", "base_rounded_total",
"section_break_tnkm", "section_break_tnkm",
"advance_paid", "advance_paid",
@@ -1318,7 +1318,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2026-02-04 13:01:36.628472", "modified": "2026-02-23 14:22:33.323946",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",

View File

@@ -73,14 +73,14 @@
"in_words", "in_words",
"disable_rounded_total", "disable_rounded_total",
"column_break_nuxg", "column_break_nuxg",
"rounded_total",
"rounding_adjustment", "rounding_adjustment",
"rounded_total",
"base_totals_section", "base_totals_section",
"base_grand_total", "base_grand_total",
"base_in_words", "base_in_words",
"column_break_bgfw", "column_break_bgfw",
"base_rounded_total",
"base_rounding_adjustment", "base_rounding_adjustment",
"base_rounded_total",
"section_break_efew", "section_break_efew",
"advance_paid", "advance_paid",
"additional_discount_section", "additional_discount_section",
@@ -1724,7 +1724,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2026-02-06 15:35:47.502692", "modified": "2026-02-23 14:25:56.665392",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",

View File

@@ -66,17 +66,19 @@
"base_total_taxes_and_charges", "base_total_taxes_and_charges",
"column_break_47", "column_break_47",
"total_taxes_and_charges", "total_taxes_and_charges",
"totals", "totals_section",
"base_grand_total",
"base_rounding_adjustment",
"base_rounded_total",
"base_in_words",
"column_break3",
"grand_total", "grand_total",
"in_words",
"column_break3",
"disable_rounded_total",
"rounding_adjustment", "rounding_adjustment",
"rounded_total", "rounded_total",
"in_words", "base_totals_section",
"disable_rounded_total", "base_grand_total",
"base_in_words",
"column_break_ydwe",
"base_rounding_adjustment",
"base_rounded_total",
"section_break_49", "section_break_49",
"apply_discount_on", "apply_discount_on",
"base_discount_amount", "base_discount_amount",
@@ -750,17 +752,10 @@
"options": "currency", "options": "currency",
"print_hide": 1 "print_hide": 1
}, },
{
"fieldname": "totals",
"fieldtype": "Section Break",
"label": "Totals",
"oldfieldtype": "Section Break",
"options": "fa fa-money"
},
{ {
"fieldname": "base_grand_total", "fieldname": "base_grand_total",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Grand Total (Company Currency)", "label": "Grand Total",
"oldfieldname": "grand_total", "oldfieldname": "grand_total",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
@@ -773,7 +768,7 @@
"depends_on": "eval:!doc.disable_rounded_total", "depends_on": "eval:!doc.disable_rounded_total",
"fieldname": "base_rounding_adjustment", "fieldname": "base_rounding_adjustment",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Rounding Adjustment (Company Currency)", "label": "Rounding Adjustment",
"no_copy": 1, "no_copy": 1,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"print_hide": 1, "print_hide": 1,
@@ -783,7 +778,7 @@
"depends_on": "eval:!doc.disable_rounded_total", "depends_on": "eval:!doc.disable_rounded_total",
"fieldname": "base_rounded_total", "fieldname": "base_rounded_total",
"fieldtype": "Currency", "fieldtype": "Currency",
"label": "Rounded Total (Company Currency)", "label": "Rounded Total",
"oldfieldname": "rounded_total", "oldfieldname": "rounded_total",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
@@ -796,7 +791,7 @@
"description": "In Words will be visible once you save the Delivery Note.", "description": "In Words will be visible once you save the Delivery Note.",
"fieldname": "base_in_words", "fieldname": "base_in_words",
"fieldtype": "Data", "fieldtype": "Data",
"label": "In Words (Company Currency)", "label": "In Words",
"length": 240, "length": 240,
"oldfieldname": "in_words", "oldfieldname": "in_words",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -1428,13 +1423,30 @@
"no_copy": 1, "no_copy": 1,
"options": "Item Wise Tax Detail", "options": "Item Wise Tax Detail",
"print_hide": 1 "print_hide": 1
},
{
"fieldname": "totals_section",
"fieldtype": "Section Break",
"label": "Totals",
"oldfieldtype": "Section Break",
"options": "fa fa-money"
},
{
"fieldname": "base_totals_section",
"fieldtype": "Section Break",
"label": "Totals (Company Currency)",
"options": "Company:company:default_currency"
},
{
"fieldname": "column_break_ydwe",
"fieldtype": "Column Break"
} }
], ],
"icon": "fa fa-truck", "icon": "fa fa-truck",
"idx": 146, "idx": 146,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2026-02-03 12:27:19.055918", "modified": "2026-02-23 23:05:39.097097",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",

View File

@@ -79,16 +79,16 @@
"total_taxes_and_charges", "total_taxes_and_charges",
"totals_section", "totals_section",
"grand_total", "grand_total",
"in_words",
"column_break_50",
"disable_rounded_total", "disable_rounded_total",
"rounding_adjustment", "rounding_adjustment",
"column_break_50",
"in_words",
"rounded_total", "rounded_total",
"base_totals_section", "base_totals_section",
"base_grand_total", "base_grand_total",
"base_rounding_adjustment",
"column_break_ugyv",
"base_in_words", "base_in_words",
"column_break_ugyv",
"base_rounding_adjustment",
"base_rounded_total", "base_rounded_total",
"section_break_42", "section_break_42",
"apply_discount_on", "apply_discount_on",
@@ -1302,7 +1302,7 @@
"idx": 261, "idx": 261,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2026-02-04 14:36:41.087460", "modified": "2026-02-23 16:56:41.075091",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",