Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: change f-string to sql params

Browse Source 
(cherry picked from commit 383a4b132ed5cc3383b035de8c22ba759b1e1241)
This commit is contained in:
Dany Robert 2023-11-21 12:46:56 +00:00 committed by Mergify
parent e0a38207f6
commit 8b7900e6a7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/utils.py
View File

@ -285,18 +285,22 @@ def get_balance_on(
cond.append("""gle.company = %s """ % (frappe.db.escape(company, percent=False))) cond.append("""gle.company = %s """ % (frappe.db.escape(company, percent=False)))
if account or (party_type and party) or account_type: if account or (party_type and party) or account_type:
precision = get_currency_precision() precision = frappe.db.escape(get_currency_precision())
if in_account_currency: if in_account_currency:
select_field = f"sum(round(debit_in_account_currency, {precision})) - sum(round(credit_in_account_currency, {precision}))" select_field = (
"sum(round(debit_in_account_currency, %s)) - sum(round(credit_in_account_currency, %s))"
)
else: else:
select_field = f"sum(round(debit, {precision})) - sum(round(credit, {precision}))" select_field = "sum(round(debit, %s)) - sum(round(credit, %s))"
bal = frappe.db.sql( bal = frappe.db.sql(
""" """
SELECT {0} SELECT {0}
FROM `tabGL Entry` gle FROM `tabGL Entry` gle
WHERE {1}""".format( WHERE {1}""".format(
select_field, " and ".join(cond) select_field, " and ".join(cond)
) ),
(precision, precision),
)[0][0] )[0][0]
# if bal is None, return 0 # if bal is None, return 0
return flt(bal) return flt(bal)