Skip to content

fix: set parent doctype on chart by ankush [frappe] PR#39286 [backport/v4]

Bot Dokos requested to merge backport/v4-dev/1261 into v4-dev

Backport of !1261 (merged)

Conflicts detected for source commit: f2f02d1a2b9d77bcafd880aaa1b702955935edac
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")
+ 
++>>>>>>> f2f02d1a2b9d77bcafd880aaa1b702955935edac
  	if filters.get("voucher_no_not_in"):
  		conditions.append("voucher_no not in %(voucher_no_not_in)s")

Merge request reports