From b87dd4239813cb5725b393d8ca9cf9295a8ea214 Mon Sep 17 00:00:00 2001 From: ljain112 Date: Mon, 7 Apr 2025 16:28:52 +0530 Subject: [PATCH] fix: remove against_voucher from General Ledger Report --- .../report/general_ledger/general_ledger.js | 5 ----- .../report/general_ledger/general_ledger.py | 21 +++---------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js index 778250d2058..035a28beee2 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.js +++ b/erpnext/accounts/report/general_ledger/general_ledger.js @@ -58,11 +58,6 @@ frappe.query_reports["General Ledger"] = { frappe.query_report.set_filter_value("group_by", "Group by Voucher (Consolidated)"); }, }, - { - fieldname: "against_voucher_no", - label: __("Against Voucher No"), - fieldtype: "Data", - }, { fieldtype: "Break", }, diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index 1579c61ac77..a8157896260 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -260,9 +260,6 @@ def get_conditions(filters): if filters.get("voucher_no"): conditions.append("voucher_no=%(voucher_no)s") - if filters.get("against_voucher_no"): - conditions.append("against_voucher=%(against_voucher_no)s") - if filters.get("ignore_err"): err_journals = frappe.db.get_all( "Journal Entry", @@ -541,14 +538,14 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map, tot data[key][rev_dr_or_cr] = 0 data[key][rev_dr_or_cr + "_in_account_currency"] = 0 - if data[key].against_voucher and gle.against_voucher: - data[key].against_voucher += ", " + gle.against_voucher - from_date, to_date = getdate(filters.from_date), getdate(filters.to_date) show_opening_entries = filters.get("show_opening_entries") for gle in gl_entries: group_by_value = gle.get(group_by) + gle.voucher_subtype = _(gle.voucher_subtype) + gle.remarks = _(gle.remarks) + gle.party_type = _(gle.party_type) if gle.posting_date < from_date or (cstr(gle.is_opening) == "Yes" and not show_opening_entries): if not group_by_voucher_consolidated: @@ -791,18 +788,6 @@ def get_columns(filters): columns.extend( [ - { - "label": _("Against Voucher Type"), - "fieldname": "against_voucher_type", - "width": 100, - }, - { - "label": _("Against Voucher"), - "fieldname": "against_voucher", - "fieldtype": "Dynamic Link", - "options": "against_voucher_type", - "width": 100, - }, {"label": _("Supplier Invoice No"), "fieldname": "bill_no", "fieldtype": "Data", "width": 100}, {"label": _("Remarks"), "fieldname": "remarks", "width": 400}, ] -- GitLab