From ba1e7e17fbcbdb4aeff41cca8ee54bae7871b364 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 (cherry picked from commit 6d1f119a0faebdd0945aa565ef0c71b7a8484aa7) --- .../report/general_ledger/general_ledger.js | 5 ----- .../report/general_ledger/general_ledger.py | 14 -------------- 2 files changed, 19 deletions(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js index 54d6fb2e2f6..2f142fc76b2 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.js +++ b/erpnext/accounts/report/general_ledger/general_ledger.js @@ -52,11 +52,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 a62ba2e3732..73a16e730ac 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -224,9 +224,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", @@ -490,9 +487,6 @@ 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") @@ -695,14 +689,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}, ] )