nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 11:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-04-14 13:26:32 +05:30
parent da65f44a47
commit 6bfb3c6905
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -498,14 +498,7 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map, tot
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_type = gle.voucher_type gle.voucher_type = gle.voucher_type
=======
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: