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

fix(dashboard): account timeline for balance sheet accounts

Browse Source
This commit is contained in:
Rushabh Mehta 2019-04-09 11:36:41 +05:30
parent da3f07221c
commit 0d3986c9f6
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
View File

@ -41,6 +41,7 @@ def get(filters=None):
def build_result(account, dates, gl_entries): def build_result(account, dates, gl_entries):
result = [[getdate(date), 0.0] for date in dates] result = [[getdate(date), 0.0] for date in dates]
root_type = frappe.db.get_value('Account', account, 'root_type')
# start with the first date # start with the first date
date_index = 0 date_index = 0
@ -55,10 +56,16 @@ def build_result(account, dates, gl_entries):
result[date_index][1] += entry.debit - entry.credit result[date_index][1] += entry.debit - entry.credit
# if account type is credit, switch balances # if account type is credit, switch balances
if frappe.db.get_value('Account', account, 'root_type') not in ('Asset', 'Expense'): if root_type not in ('Asset', 'Expense'):
for r in result: for r in result:
r[1] = -1 * r[1] r[1] = -1 * r[1]
# for balance sheet accounts, the totals are cumulative
if root_type in ('Asset', 'Liability', 'Equity'):
for i, r in enumerate(result):
if i < 0:
r[1] = r[1] + result[i-1][1]
return result return result
def get_gl_entries(account, to_date): def get_gl_entries(account, to_date):