CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-02 10:04:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: revert #46900 - against_voucher filter in general ledger

Browse Source 
(cherry picked from commit adb331ef71)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.py
This commit is contained in:
ruthra kumar
2025-04-14 12:27:51 +05:30
committed by Mergify
parent 98ffbfb432
commit 5844aafd12
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/report/general_ledger/general_ledger.js
View File

@@ -52,6 +52,11 @@ frappe.query_reports["General Ledger"] = {
frappe.query_report.set_filter_value("group_by", "Group by Voucher (Consolidated)"); frappe.query_report.set_filter_value("group_by", "Group by Voucher (Consolidated)");
}, },
}, },
{
fieldname: "against_voucher_no",
label: __("Against Voucher No"),
fieldtype: "Data",
},
{ {
fieldtype: "Break", fieldtype: "Break",
}, },

21
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@@ -225,6 +225,9 @@ def get_conditions(filters):
if filters.get("voucher_no"): if filters.get("voucher_no"):
conditions.append("voucher_no=%(voucher_no)s") 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"): if filters.get("ignore_err"):
err_journals = frappe.db.get_all( err_journals = frappe.db.get_all(
"Journal Entry", "Journal Entry",
@@ -468,11 +471,21 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map):
data[key][rev_dr_or_cr] = 0 data[key][rev_dr_or_cr] = 0
data[key][rev_dr_or_cr + "_in_account_currency"] = 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) from_date, to_date = getdate(filters.from_date), getdate(filters.to_date)
show_opening_entries = filters.get("show_opening_entries") show_opening_entries = filters.get("show_opening_entries")
for gle in gl_entries: for gle in gl_entries:
group_by_value = gle.get(group_by) group_by_value = gle.get(group_by)
<<<<<<< HEAD
=======
gle.voucher_subtype = _(gle.voucher_subtype)
gle.against_voucher_type = _(gle.against_voucher_type)
gle.remarks = _(gle.remarks)
gle.party_type = _(gle.party_type)
>>>>>>> adb331ef71 (fix: revert #46900 - against_voucher filter in general ledger)
if gle.posting_date < from_date or (cstr(gle.is_opening) == "Yes" and not show_opening_entries): if gle.posting_date < from_date or (cstr(gle.is_opening) == "Yes" and not show_opening_entries):
if not group_by_voucher_consolidated: if not group_by_voucher_consolidated:
@@ -630,6 +643,14 @@ def get_columns(filters):
columns.extend( 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": _("Supplier Invoice No"), "fieldname": "bill_no", "fieldtype": "Data", "width": 100},
] ]
) )