schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: user can select disabled accounts in taxes table

Browse Source 
(cherry picked from commit a1e3ae8869)
This commit is contained in:
Saqib Ansari
2022-05-11 13:01:06 +05:30
committed by Mergify
parent 9fbd170fa4
commit 047c879bec
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/queries.py
View File

@@ -162,6 +162,7 @@ def tax_account_query(doctype, txt, searchfield, start, page_len, filters):
{account_type_condition} {account_type_condition}
AND is_group = 0 AND is_group = 0
AND company = %(company)s AND company = %(company)s
AND disabled = %(disabled)s
AND (account_currency = %(currency)s or ifnull(account_currency, '') = '') AND (account_currency = %(currency)s or ifnull(account_currency, '') = '')
AND `{searchfield}` LIKE %(txt)s AND `{searchfield}` LIKE %(txt)s
{mcond} {mcond}
@@ -175,6 +176,7 @@ def tax_account_query(doctype, txt, searchfield, start, page_len, filters):
dict( dict(
account_types=filters.get("account_type"), account_types=filters.get("account_type"),
company=filters.get("company"), company=filters.get("company"),
disabled=filters.get("disabled", 0),
currency=company_currency, currency=company_currency,
txt="%{}%".format(txt), txt="%{}%".format(txt),
offset=start, offset=start,

3
erpnext/public/js/controllers/accounts.js
View File

@@ -27,7 +27,8 @@ frappe.ui.form.on(cur_frm.doctype, {
query: "erpnext.controllers.queries.tax_account_query", query: "erpnext.controllers.queries.tax_account_query",
filters: { filters: {
"account_type": account_type, "account_type": account_type,
"company": doc.company "company": doc.company,
"disabled": 0
} }
} }
}); });