Merge branch 'develop' into disable-item-tax-category

2022-02-04 18:10:39 +01:00
parent 663c594ead 65923bd856
commit b5242df15b
478 changed files with 17312 additions and 11435 deletions
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -249,6 +249,9 @@ def item_query(doctype, txt, searchfield, start, page_len, filters, as_dict=Fals
 				del filters['customer']
 			else:
 				del filters['supplier']
+		else:
+			filters.pop('customer', None)
+			filters.pop('supplier', None)


 	description_cond = ''