From 8d1e855dc87b37a6a69d646a8174d7c6446bb768 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 18:01:51 +0530 Subject: [PATCH] fix: rename unchanged group_by filter related to general ledger report (backport #47366) (#47405) fix: rename unchanged group_by filter related to general ledger report (#47366) (cherry picked from commit 3de249dcba0261544e98d62721aa446bed45531c) Co-authored-by: Diptanil Saha --- .../doctype/invoice_discounting/invoice_discounting.js | 2 +- erpnext/accounts/doctype/journal_entry/journal_entry.js | 2 +- erpnext/accounts/doctype/payment_entry/payment_entry.js | 2 +- .../doctype/period_closing_voucher/period_closing_voucher.js | 2 +- erpnext/accounts/test/test_reports.py | 4 ++-- erpnext/public/js/controllers/stock_controller.js | 2 +- .../doctype/subcontracting_receipt/subcontracting_receipt.js | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) 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 a64aba417a6..f2f9f70e75d 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -35,7 +35,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 2e13c932de4..47ffc5719e4 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -411,7 +411,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 095310c7e70..15de8cec243 100644 --- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js +++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js @@ -47,7 +47,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 56b7832a32e..d8878328cfa 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", {"range": "30, 60, 90, 120"}), ("Accounts Receivable", {"range": "30, 60, 90, 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 3181d76857d..bc2df9c388d 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 }; diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js index 2aaf8a8adcd..c9fe457ef79 100644 --- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js +++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js @@ -54,7 +54,7 @@ frappe.ui.form.on("Subcontracting Receipt", { 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");