nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-14 12:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

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

24
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

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

10
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

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

6
erpnext/selling/doctype/sales_order/sales_order.json
View File

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

52
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

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

10
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

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