nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove incorrect import

Browse Source 
(cherry picked from commit fc2edfbded)

# Conflicts:
#	erpnext/controllers/queries.py
This commit is contained in:
ruthra kumar
2026-03-17 15:23:05 +05:30
committed by Mergify
parent e2a34ab3fe
commit d352322688
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/controllers/queries.py
View File

@@ -615,9 +615,13 @@ def get_blanket_orders(doctype, txt, searchfield, start, page_len, filters):
@frappe.whitelist() @frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs @frappe.validate_and_sanitize_search_inputs
<<<<<<< HEAD
def get_income_account(doctype, txt, searchfield, start, page_len, filters): def get_income_account(doctype, txt, searchfield, start, page_len, filters):
from erpnext.controllers.queries import get_match_cond from erpnext.controllers.queries import get_match_cond
=======
def get_income_account(doctype: str, txt: str, searchfield: str, start: int, page_len: int, filters: dict):
>>>>>>> fc2edfbded (chore: remove incorrect import)
# income account can be any Credit account, # income account can be any Credit account,
# but can also be a Asset account with account_type='Income Account' in special circumstances. # but can also be a Asset account with account_type='Income Account' in special circumstances.
# Hence the first condition is an "OR" # Hence the first condition is an "OR"
@@ -703,9 +707,13 @@ def get_filtered_dimensions(doctype, txt, searchfield, start, page_len, filters,
@frappe.whitelist() @frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs @frappe.validate_and_sanitize_search_inputs
<<<<<<< HEAD
def get_expense_account(doctype, txt, searchfield, start, page_len, filters): def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
from erpnext.controllers.queries import get_match_cond from erpnext.controllers.queries import get_match_cond
=======
def get_expense_account(doctype: str, txt: str, searchfield: str, start: int, page_len: int, filters: dict):
>>>>>>> fc2edfbded (chore: remove incorrect import)
if not filters: if not filters:
filters = {} filters = {}