fix: sales team commission overallocation on fetching items from multiple quotations to Sales Order by ruthra-kumar [frappe] PR#39237 [backport/v4]
Backport of !1225 (merged)
Conflicts detected for source commit: 6569ab0f438836872079a1b59ee4bfd7fd9367db
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")
+
++>>>>>>> 6569ab0f438836872079a1b59ee4bfd7fd9367db
if filters.get("voucher_no_not_in"):
conditions.append("voucher_no not in %(voucher_no_not_in)s")