Skip to content

fix: Ignore default payment terms template for opening invoices by deepeshgarg007 [frappe] PR#39256 [backport/v4]

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

Backport of !1263 (merged)

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

Merge request reports