From 29be73c25641024599bc3782710e2d87936cf343 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Mon, 13 Apr 2026 15:21:39 +0530 Subject: [PATCH] fix: conflicting issue --- .../accounts/doctype/journal_entry/journal_entry.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index eba7ecd1020..8b6cd3eee23 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -1537,18 +1537,7 @@ def get_payment_entry(ref_doc, args): @frappe.whitelist() @frappe.validate_and_sanitize_search_inputs -<<<<<<< HEAD def get_against_jv(doctype, txt, searchfield, start, page_len, filters): -======= -def get_against_jv( - doctype: str, - txt: str, - searchfield: str, - start: int, - page_len: int, - filters: dict, -): ->>>>>>> c133f7156d (fix: replace raw SQL with qb in get_against_jv to prevent SQL injection) if not frappe.db.has_column("Journal Entry", searchfield): return []