From 694f158fc87895000bab3a43701138319ec1fb3d Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 14 Apr 2025 13:25:36 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/accounts/report/general_ledger/general_ledger.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index 5fbf4e0e4c5..62806a957e3 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -479,13 +479,6 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map): for gle in gl_entries: 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 not group_by_voucher_consolidated: