nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2025-02-05 16:37:09 +05:30
parent 8ea9a9e467
commit 0b591ba7eb
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/controllers/queries.py
View File

@@ -839,14 +839,9 @@ def get_tax_template(doctype, txt, searchfield, start, page_len, filters):
"company": company, "company": company,
} }
<<<<<<< HEAD
taxes = _get_item_tax_template(args, taxes, for_validate=True) 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() txt = txt.lower()
return [(d,) for d in set(taxes) if not txt or txt in d.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): def get_fields(doctype, fields=None):