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

Update balance_sheet.py

Browse Source
This commit is contained in:
ShashaQin 2016-02-01 09:35:53 +08:00 committed by Nabin Hait
parent 1f51e71827
commit 15d7224335
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/report/balance_sheet/balance_sheet.py
View File

@ -10,9 +10,9 @@ from erpnext.accounts.report.financial_statements import (get_period_list, get_c
def execute(filters=None):
period_list = get_period_list(filters.fiscal_year, filters.periodicity, from_beginning=True)
asset = get_data(filters.company, "Asset", "Debit", period_list)
liability = get_data(filters.company, "Liability", "Credit", period_list)
equity = get_data(filters.company, "Equity", "Credit", period_list)
asset = get_data(filters.company, "Asset", "Debit", period_list, filters.accumulated_value)
liability = get_data(filters.company, "Liability", "Credit", period_list, filters.accumulated_value)
equity = get_data(filters.company, "Equity", "Credit", period_list, filters.accumulated_value)
provisional_profit_loss = get_provisional_profit_loss(asset, liability, equity,
period_list, filters.company)
@ -23,12 +23,13 @@ def execute(filters=None):
if provisional_profit_loss:
data.append(provisional_profit_loss)
columns = get_columns(period_list)
columns = get_columns(filters.periodicity,period_list,filters.accumulated_value)
return columns, data
def get_provisional_profit_loss(asset, liability, equity, period_list, company):
if asset and (liability or equity):
total_column=0
provisional_profit_loss = {
"account_name": "'" + _("Provisional Profit / Loss (Credit)") + "'",
"account": None,
@ -49,6 +50,9 @@ def get_provisional_profit_loss(asset, liability, equity, period_list, company):
if provisional_profit_loss[period.key]:
has_value = True
total_column=total_column+provisional_profit_loss[period.key]
provisional_profit_loss["total"]=total_column
if has_value:
return provisional_profit_loss