diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js index 974f037a81d..44aa2eac98d 100644 --- a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js +++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js @@ -197,7 +197,7 @@ frappe.ui.form.on("Invoice Discounting", { from_date: frm.doc.posting_date, to_date: moment(frm.doc.modified).format("YYYY-MM-DD"), company: frm.doc.company, - group_by: "Group by Voucher (Consolidated)", + categorize_by: "Categorize by Voucher (Consolidated)", show_cancelled_entries: frm.doc.docstatus === 2, }; frappe.set_route("query-report", "General Ledger"); diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index f3785800de0..c4e02ab7eba 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -34,7 +34,7 @@ frappe.ui.form.on("Journal Entry", { to_date: moment(frm.doc.modified).format("YYYY-MM-DD"), company: frm.doc.company, finance_book: frm.doc.finance_book, - group_by: "", + categorize_by: "", show_cancelled_entries: frm.doc.docstatus === 2, }; frappe.set_route("query-report", "General Ledger"); diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index f4819aaea59..6c028eb0a4b 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -319,7 +319,7 @@ frappe.ui.form.on('Payment Entry', { "from_date": frm.doc.posting_date, "to_date": moment(frm.doc.modified).format('YYYY-MM-DD'), "company": frm.doc.company, - "group_by": "", + "categorize_by": "", "show_cancelled_entries": frm.doc.docstatus === 2 }; frappe.set_route("query-report", "General Ledger"); diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js index 82d8cb37fe7..742e4f71576 100644 --- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js +++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js @@ -29,7 +29,7 @@ frappe.ui.form.on("Period Closing Voucher", { from_date: frm.doc.posting_date, to_date: moment(frm.doc.modified).format("YYYY-MM-DD"), company: frm.doc.company, - group_by: "", + categorize_by: "", show_cancelled_entries: frm.doc.docstatus === 2, }; frappe.set_route("query-report", "General Ledger"); diff --git a/erpnext/accounts/test/test_reports.py b/erpnext/accounts/test/test_reports.py index c2e10f8fd47..0cca8db4e77 100644 --- a/erpnext/accounts/test/test_reports.py +++ b/erpnext/accounts/test/test_reports.py @@ -12,8 +12,8 @@ DEFAULT_FILTERS = { REPORT_FILTER_TEST_CASES: list[tuple[ReportName, ReportFilters]] = [ - ("General Ledger", {"group_by": "Group by Voucher (Consolidated)"}), - ("General Ledger", {"group_by": "Group by Voucher (Consolidated)", "include_dimensions": 1}), + ("General Ledger", {"categorize_by": "Categorize by Voucher (Consolidated)"}), + ("General Ledger", {"categorize_by": "Categorize by Voucher (Consolidated)", "include_dimensions": 1}), ("Accounts Payable", {"range1": 30, "range2": 60, "range3": 90, "range4": 120}), ("Accounts Receivable", {"range1": 30, "range2": 60, "range3": 90, "range4": 120}), ("Consolidated Financial Statement", {"report": "Balance Sheet"}), diff --git a/erpnext/public/js/controllers/stock_controller.js b/erpnext/public/js/controllers/stock_controller.js index 71de690b835..3ca315ccd1c 100644 --- a/erpnext/public/js/controllers/stock_controller.js +++ b/erpnext/public/js/controllers/stock_controller.js @@ -87,7 +87,7 @@ erpnext.stock.StockController = class StockController extends frappe.ui.form.Con from_date: me.frm.doc.posting_date, to_date: moment(me.frm.doc.modified).format('YYYY-MM-DD'), company: me.frm.doc.company, - group_by: "Group by Voucher (Consolidated)", + categorize_by: "Categorize by Voucher (Consolidated)", show_cancelled_entries: me.frm.doc.docstatus === 2, ignore_prepared_report: true };