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

fix: fetch acc dimension fieldname

Browse Source
This commit is contained in:
Gursheen Anand 2023-07-21 13:37:48 +05:30
parent 21c993a7b3
commit 1c5c310f5a
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/accounts/report/profitability_analysis/profitability_analysis.py
View File

@ -6,6 +6,7 @@ import frappe
from frappe import _ from frappe import _
from frappe.utils import cstr, flt from frappe.utils import cstr, flt
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_dimensions
from erpnext.accounts.report.financial_statements import ( from erpnext.accounts.report.financial_statements import (
filter_accounts, filter_accounts,
filter_out_zero_value_rows, filter_out_zero_value_rows,
@ -19,7 +20,9 @@ def execute(filters=None):
if filters.get("based_on") == "Accounting Dimension" and not filters.get("accounting_dimension"): if filters.get("based_on") == "Accounting Dimension" and not filters.get("accounting_dimension"):
frappe.throw(_("Select Accounting Dimension.")) frappe.throw(_("Select Accounting Dimension."))
based_on = filters.based_on.replace(" ", "_").lower() based_on = (
filters.based_on if filters.based_on != "Accounting Dimension" else filters.accounting_dimension
)
validate_filters(filters) validate_filters(filters)
accounts = get_accounts_data(based_on, filters.get("company")) accounts = get_accounts_data(based_on, filters.get("company"))
data = get_data(accounts, filters, based_on) data = get_data(accounts, filters, based_on)
@ -28,17 +31,15 @@ def execute(filters=None):
def get_accounts_data(based_on, company): def get_accounts_data(based_on, company):
if based_on == "cost_center": if based_on == "Cost Center":
return frappe.db.sql( return frappe.db.sql(
"""select name, parent_cost_center as parent_account, cost_center_name as account_name, lft, rgt """select name, parent_cost_center as parent_account, cost_center_name as account_name, lft, rgt
from `tabCost Center` where company=%s order by name""", from `tabCost Center` where company=%s order by name""",
company, company,
as_dict=True, as_dict=True,
) )
elif based_on == "project": elif based_on == "Project":
return frappe.get_all("Project", fields=["name"], filters={"company": company}, order_by="name") return frappe.get_all("Project", fields=["name"], filters={"company": company}, order_by="name")
elif based_on == "accounting_dimension":
return frappe.get_all("Accounting Dimension", fields=["name"], order_by="name")
else: else:
filters = {} filters = {}
doctype = frappe.unscrub(based_on) doctype = frappe.unscrub(based_on)
@ -58,13 +59,17 @@ def get_data(accounts, filters, based_on):
gl_entries_by_account = {} gl_entries_by_account = {}
accounting_dimensions = get_dimensions(with_cost_center_and_project=True)[0]
fieldname = ""
for dimension in accounting_dimensions:
if dimension["document_type"] == based_on:
fieldname = dimension["fieldname"]
set_gl_entries_by_account( set_gl_entries_by_account(
filters.get("company"), filters.get("company"),
filters.get("from_date"), filters.get("from_date"),
filters.get("to_date"), filters.get("to_date"),
based_on fieldname,
if based_on != "accounting_dimension"
else filters.accounting_dimension.replace(" ", "_").lower(),
gl_entries_by_account, gl_entries_by_account,
ignore_closing_entries=not flt(filters.get("with_period_closing_entry")), ignore_closing_entries=not flt(filters.get("with_period_closing_entry")),
) )