fix: Duplicate Closing Stock Balance by s-aga-r [frappe] PR#39262 [backport/v4]
Backport of !1240 (merged)
Conflicts detected for source commit: e7b322f44eb8a9d13e8f3181a4e9546e89b3582e
diff --cc erpnext/accounts/report/general_ledger/general_ledger.py
index 139d381172,6a3545dff1..0000000000
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@@ -276,6 -276,9 +276,12 @@@ def get_conditions(filters)
if filters.get("voucher_no"):
conditions.append("voucher_no=%(voucher_no)s")
++<<<<<<< HEAD
++=======
+ if filters.get("against_voucher_no"):
+ conditions.append("against_voucher=%(against_voucher_no)s")
+
++>>>>>>> e7b322f44eb8a9d13e8f3181a4e9546e89b3582e
if filters.get("voucher_no_not_in"):
conditions.append("voucher_no not in %(voucher_no_not_in)s")