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

refactor: primitive summary for p&l and balance sheet

Browse Source 
(cherry picked from commit eb4c476490)
This commit is contained in:
ruthra kumar
2023-09-15 21:24:53 +05:30
committed by Mergify
parent da17496e3d
commit 9e15ecfe34
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/report/balance_sheet/balance_sheet.py
View File

@@ -97,11 +97,11 @@ def execute(filters=None):
chart = get_chart_data(filters, columns, asset, liability, equity) chart = get_chart_data(filters, columns, asset, liability, equity)
report_summary = get_report_summary( report_summary, primitive_summary = get_report_summary(
period_list, asset, liability, equity, provisional_profit_loss, currency, filters period_list, asset, liability, equity, provisional_profit_loss, currency, filters
) )
return columns, data, message, chart, report_summary return columns, data, message, chart, report_summary, primitive_summary
def get_provisional_profit_loss( def get_provisional_profit_loss(
@@ -217,7 +217,7 @@ def get_report_summary(
"datatype": "Currency", "datatype": "Currency",
"currency": currency, "currency": currency,
}, },
] ], (net_asset - net_liability + net_equity)
def get_chart_data(filters, columns, asset, liability, equity): def get_chart_data(filters, columns, asset, liability, equity):

6
erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
View File

@@ -66,11 +66,11 @@ def execute(filters=None):
currency = filters.presentation_currency or frappe.get_cached_value( currency = filters.presentation_currency or frappe.get_cached_value(
"Company", filters.company, "default_currency" "Company", filters.company, "default_currency"
) )
report_summary = get_report_summary( report_summary, primitive_summary = get_report_summary(
period_list, filters.periodicity, income, expense, net_profit_loss, currency, filters period_list, filters.periodicity, income, expense, net_profit_loss, currency, filters
) )
return columns, data, None, chart, report_summary return columns, data, None, chart, report_summary, primitive_summary
def get_report_summary( def get_report_summary(
@@ -112,7 +112,7 @@ def get_report_summary(
"datatype": "Currency", "datatype": "Currency",
"currency": currency, "currency": currency,
}, },
] ], net_profit
def get_net_profit_loss(income, expense, period_list, company, currency=None, consolidated=False): def get_net_profit_loss(income, expense, period_list, company, currency=None, consolidated=False):