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

refactor(treewide): formatting and ruff fixes, + manually enabled F401

Browse Source 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
This commit is contained in:
Akhil Narang
2024-03-27 11:37:26 +05:30
parent 8afb7790de
commit 3effaf21ef
574 changed files with 4135 additions and 6276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@@ -102,9 +102,7 @@ def validate_party(filters):
def set_account_currency(filters):
if filters.get("account") or (filters.get("party") and len(filters.party) == 1):
filters["company_currency"] = frappe.get_cached_value(
"Company", filters.company, "default_currency"
)
filters["company_currency"] = frappe.get_cached_value("Company", filters.company, "default_currency")
account_currency = None
if filters.get("account"):
@@ -164,9 +162,7 @@ def get_gl_entries(filters, accounting_dimensions):
credit_in_account_currency """
if filters.get("show_remarks"):
if remarks_length := frappe.db.get_single_value(
"Accounts Settings", "general_ledger_remarks_length"
):
if remarks_length := frappe.db.get_single_value("Accounts Settings", "general_ledger_remarks_length"):
select_fields += f",substr(remarks, 1, {remarks_length}) as 'remarks'"
else:
select_fields += """,remarks"""
@@ -197,7 +193,7 @@ def get_gl_entries(filters, accounting_dimensions):
)
gl_entries = frappe.db.sql(
"""
f"""
select
name as gl_entry, posting_date, account, party_type, party,
voucher_type, voucher_subtype, voucher_no, {dimension_fields}
@@ -205,15 +201,9 @@ def get_gl_entries(filters, accounting_dimensions):
against_voucher_type, against_voucher, account_currency,
against, is_opening, creation {select_fields}
from `tabGL Entry`
where company=%(company)s {conditions}
where company=%(company)s {get_conditions(filters)}
{order_by_statement}
""".format(
dimension_fields=dimension_fields,
transaction_currency_fields=transaction_currency_fields,
select_fields=select_fields,
conditions=get_conditions(filters),
order_by_statement=order_by_statement,
),
""",
filters,
as_dict=1,
)
@@ -283,7 +273,9 @@ def get_conditions(filters):
if filters.get("company_fb") and cstr(filters.get("finance_book")) != cstr(
filters.get("company_fb")
):
frappe.throw(_("To use a different finance book, please uncheck 'Include Default FB Entries'"))
frappe.throw(
_("To use a different finance book, please uncheck 'Include Default FB Entries'")
)
else:
conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
else:
@@ -315,9 +307,9 @@ def get_conditions(filters):
filters[dimension.fieldname] = get_dimension_with_children(
dimension.document_type, filters.get(dimension.fieldname)
)
conditions.append("{0} in %({0})s".format(dimension.fieldname))
conditions.append(f"{dimension.fieldname} in %({dimension.fieldname})s")
else:
conditions.append("{0} in %({0})s".format(dimension.fieldname))
conditions.append(f"{dimension.fieldname} in %({dimension.fieldname})s")
return "and {}".format(" and ".join(conditions)) if conditions else ""
@@ -351,7 +343,7 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension
data.append(totals.opening)
if filters.get("group_by") != "Group by Voucher (Consolidated)":
for acc, acc_dict in gle_map.items():
for _acc, acc_dict in gle_map.items():
# acc
if acc_dict.entries:
# opening
@@ -383,7 +375,7 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension
def get_totals_dict():
def _get_debit_credit_dict(label):
return _dict(
account="'{0}'".format(label),
account=f"'{label}'",
debit=0.0,
credit=0.0,
debit_in_account_currency=0.0,
@@ -432,9 +424,10 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map):
data[key].debit_in_account_currency += gle.debit_in_account_currency
data[key].credit_in_account_currency += gle.credit_in_account_currency
if filters.get("show_net_values_in_party_account") and account_type_map.get(
data[key].account
) in ("Receivable", "Payable"):
if filters.get("show_net_values_in_party_account") and account_type_map.get(data[key].account) in (
"Receivable",
"Payable",
):
net_value = data[key].debit - data[key].credit
net_value_in_account_currency = (
data[key].debit_in_account_currency - data[key].credit_in_account_currency
@@ -512,21 +505,19 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map):
def get_account_type_map(company):
account_type_map = frappe._dict(
frappe.get_all(
"Account", fields=["name", "account_type"], filters={"company": company}, as_list=1
)
frappe.get_all("Account", fields=["name", "account_type"], filters={"company": company}, as_list=1)
)
return account_type_map
def get_result_as_list(data, filters):
balance, balance_in_account_currency = 0, 0
balance, _balance_in_account_currency = 0, 0
inv_details = get_supplier_invoice_details()
for d in data:
if not d.get("posting_date"):
balance, balance_in_account_currency = 0, 0
balance, _balance_in_account_currency = 0, 0
balance = get_balance(d, balance, "debit", "credit")
d["balance"] = balance