nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-02-01 16:23:26 +05:30
parent 6284553f23
commit 68c5a6e86f
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@@ -231,11 +231,6 @@ def get_conditions(filters):
if filters.get("voucher_no"): if filters.get("voucher_no"):
conditions.append("voucher_no=%(voucher_no)s") conditions.append("voucher_no=%(voucher_no)s")
<<<<<<< HEAD
=======
if filters.get("against_voucher_no"):
conditions.append("against_voucher=%(against_voucher_no)s")
if filters.get("ignore_err"): if filters.get("ignore_err"):
err_journals = frappe.db.get_all( err_journals = frappe.db.get_all(
"Journal Entry", "Journal Entry",
@@ -249,7 +244,6 @@ def get_conditions(filters):
if err_journals: if err_journals:
filters.update({"voucher_no_not_in": [x[0] for x in err_journals]}) filters.update({"voucher_no_not_in": [x[0] for x in err_journals]})
>>>>>>> c077eda64e (refactor: move ignore ERR filters from SOA to General Ledger)
if filters.get("voucher_no_not_in"): if filters.get("voucher_no_not_in"):
conditions.append("voucher_no not in %(voucher_no_not_in)s") conditions.append("voucher_no not in %(voucher_no_not_in)s")