nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-21 18:36:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: rename unchanged group_by filter related to general ledger report (backport #47366) (#47405)

Browse Source 
fix: rename unchanged group_by filter related to general ledger report (#47366)

(cherry picked from commit 3de249dcba)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
This commit is contained in:
mergify[bot]
2025-05-05 18:01:51 +05:30
committed by GitHub
parent 0e5c709f7b
commit 8d1e855dc8
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js
View File

@@ -197,7 +197,7 @@ frappe.ui.form.on("Invoice Discounting", {
from_date: frm.doc.posting_date, from_date: frm.doc.posting_date,
to_date: moment(frm.doc.modified).format("YYYY-MM-DD"), to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
company: frm.doc.company, company: frm.doc.company,
group_by: "Group by Voucher (Consolidated)", categorize_by: "Categorize by Voucher (Consolidated)",
show_cancelled_entries: frm.doc.docstatus === 2, show_cancelled_entries: frm.doc.docstatus === 2,
}; };
frappe.set_route("query-report", "General Ledger"); frappe.set_route("query-report", "General Ledger");

2
erpnext/accounts/doctype/journal_entry/journal_entry.js
View File

@@ -35,7 +35,7 @@ frappe.ui.form.on("Journal Entry", {
to_date: moment(frm.doc.modified).format("YYYY-MM-DD"), to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
company: frm.doc.company, company: frm.doc.company,
finance_book: frm.doc.finance_book, finance_book: frm.doc.finance_book,
group_by: "", categorize_by: "",
show_cancelled_entries: frm.doc.docstatus === 2, show_cancelled_entries: frm.doc.docstatus === 2,
}; };
frappe.set_route("query-report", "General Ledger"); frappe.set_route("query-report", "General Ledger");

2
erpnext/accounts/doctype/payment_entry/payment_entry.js
View File

@@ -411,7 +411,7 @@ frappe.ui.form.on("Payment Entry", {
from_date: frm.doc.posting_date, from_date: frm.doc.posting_date,
to_date: moment(frm.doc.modified).format("YYYY-MM-DD"), to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
company: frm.doc.company, company: frm.doc.company,
group_by: "", categorize_by: "",
show_cancelled_entries: frm.doc.docstatus === 2, show_cancelled_entries: frm.doc.docstatus === 2,
}; };
frappe.set_route("query-report", "General Ledger"); frappe.set_route("query-report", "General Ledger");

2
erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
View File

@@ -47,7 +47,7 @@ frappe.ui.form.on("Period Closing Voucher", {
from_date: frm.doc.posting_date, from_date: frm.doc.posting_date,
to_date: moment(frm.doc.modified).format("YYYY-MM-DD"), to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
company: frm.doc.company, company: frm.doc.company,
group_by: "", categorize_by: "",
show_cancelled_entries: frm.doc.docstatus === 2, show_cancelled_entries: frm.doc.docstatus === 2,
}; };
frappe.set_route("query-report", "General Ledger"); frappe.set_route("query-report", "General Ledger");

4
erpnext/accounts/test/test_reports.py
View File

@@ -12,8 +12,8 @@ DEFAULT_FILTERS = {
REPORT_FILTER_TEST_CASES: list[tuple[ReportName, ReportFilters]] = [ REPORT_FILTER_TEST_CASES: list[tuple[ReportName, ReportFilters]] = [
("General Ledger", {"group_by": "Group by Voucher (Consolidated)"}), ("General Ledger", {"categorize_by": "Categorize by Voucher (Consolidated)"}),
("General Ledger", {"group_by": "Group by Voucher (Consolidated)", "include_dimensions": 1}), ("General Ledger", {"categorize_by": "Categorize by Voucher (Consolidated)", "include_dimensions": 1}),
("Accounts Payable", {"range": "30, 60, 90, 120"}), ("Accounts Payable", {"range": "30, 60, 90, 120"}),
("Accounts Receivable", {"range": "30, 60, 90, 120"}), ("Accounts Receivable", {"range": "30, 60, 90, 120"}),
("Consolidated Financial Statement", {"report": "Balance Sheet"}), ("Consolidated Financial Statement", {"report": "Balance Sheet"}),

2
erpnext/public/js/controllers/stock_controller.js
View File

@@ -87,7 +87,7 @@ erpnext.stock.StockController = class StockController extends frappe.ui.form.Con
from_date: me.frm.doc.posting_date, from_date: me.frm.doc.posting_date,
to_date: moment(me.frm.doc.modified).format('YYYY-MM-DD'), to_date: moment(me.frm.doc.modified).format('YYYY-MM-DD'),
company: me.frm.doc.company, 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, show_cancelled_entries: me.frm.doc.docstatus === 2,
ignore_prepared_report: true ignore_prepared_report: true
}; };

2
erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js
View File

@@ -54,7 +54,7 @@ frappe.ui.form.on("Subcontracting Receipt", {
from_date: frm.doc.posting_date, from_date: frm.doc.posting_date,
to_date: moment(frm.doc.modified).format("YYYY-MM-DD"), to_date: moment(frm.doc.modified).format("YYYY-MM-DD"),
company: frm.doc.company, company: frm.doc.company,
group_by: "Group by Voucher (Consolidated)", categorize_by: "Categorize by Voucher (Consolidated)",
show_cancelled_entries: frm.doc.docstatus === 2, show_cancelled_entries: frm.doc.docstatus === 2,
}; };
frappe.set_route("query-report", "General Ledger"); frappe.set_route("query-report", "General Ledger");