nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44655 from ruthra-kumar/manual_backport_pr_44533

Browse Source 
refactor: consider against_voucher_no when voucher_no is filtered (backport 44533)
This commit is contained in:
ruthra kumar
2024-12-11 16:03:37 +05:30
committed by GitHub
parent f3cf28a4f4 7e0ff851ab
commit 282f133500
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,9 +35,6 @@ def execute(filters=None):
if filters.get("party"): if filters.get("party"):
filters.party = frappe.parse_json(filters.get("party")) filters.party = frappe.parse_json(filters.get("party"))
if filters.get("voucher_no") and not filters.get("group_by"):
filters.group_by = "Group by Voucher (Consolidated)"
validate_filters(filters, account_details) validate_filters(filters, account_details)
validate_party(filters) validate_party(filters)
@@ -373,16 +370,21 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension
if acc_dict.entries: if acc_dict.entries:
# opening # opening
data.append({"debit_in_transaction_currency": None, "credit_in_transaction_currency": None}) data.append({"debit_in_transaction_currency": None, "credit_in_transaction_currency": None})
if filters.get("group_by") != "Group by Voucher": if (not filters.get("group_by") and not filters.get("voucher_no")) or (
filters.get("group_by") and filters.get("group_by") != "Group by Voucher"
):
data.append(acc_dict.totals.opening) data.append(acc_dict.totals.opening)
data += acc_dict.entries data += acc_dict.entries
# totals # totals
data.append(acc_dict.totals.total) if filters.get("group_by") or not filters.voucher_no:
data.append(acc_dict.totals.total)
# closing # closing
if filters.get("group_by") != "Group by Voucher": if (not filters.get("group_by") and not filters.get("voucher_no")) or (
filters.get("group_by") and filters.get("group_by") != "Group by Voucher"
):
data.append(acc_dict.totals.closing) data.append(acc_dict.totals.closing)
data.append({"debit_in_transaction_currency": None, "credit_in_transaction_currency": None}) data.append({"debit_in_transaction_currency": None, "credit_in_transaction_currency": None})