From 0b591ba7eb0a99273ee495144d3b90d99ef10feb Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Wed, 5 Feb 2025 16:37:09 +0530 Subject: [PATCH] chore: resolve conflicts --- erpnext/controllers/queries.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index 20979c63a60..f124bfdbfc8 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -839,14 +839,9 @@ def get_tax_template(doctype, txt, searchfield, start, page_len, filters): "company": company, } -<<<<<<< HEAD taxes = _get_item_tax_template(args, taxes, for_validate=True) - return [(d,) for d in set(taxes)] -======= - taxes = _get_item_tax_template(ctx, taxes, for_validate=True) txt = txt.lower() return [(d,) for d in set(taxes) if not txt or txt in d.lower()] ->>>>>>> 4dd37ba033 (fix: filter the item tax template using the input text) def get_fields(doctype, fields=None):