(cherry picked from commit 62fc544280)
# Conflicts:
# erpnext/controllers/queries.py
# erpnext/controllers/tests/test_queries.py
(cherry picked from commit 62fc544280)
# Conflicts:
# erpnext/controllers/queries.py
# erpnext/controllers/tests/test_queries.py