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

fix(dashboard): Consider opening balance

Browse Source
This commit is contained in:
Aditya Hase 2019-01-09 13:09:31 +05:30
parent 6cadf77073
commit 5911e100ad
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/dashboard.py
View File

@ -32,6 +32,8 @@ def get(filters= None):
for row in report_results[1:-2]: for row in report_results[1:-2]:
_results.append([row[key] for key in interesting_fields]) _results.append([row[key] for key in interesting_fields])
_results = add_opening_balance(from_date, _results, report_results[0])
grouped_results = groupby(_results, key=itemgetter(0)) grouped_results = groupby(_results, key=itemgetter(0))
results = [list(values)[-1] for key, values in grouped_results] results = [list(values)[-1] for key, values in grouped_results]
@ -61,6 +63,12 @@ def get_from_date_from_timespan(timespan):
return add_to_date(None, years=years, months=months, days=days, return add_to_date(None, years=years, months=months, days=days,
as_string=True, as_datetime=True) as_string=True, as_datetime=True)
def add_opening_balance(from_date, _results, opening):
if not _results or (_results[0][0] != getdate(from_date)):
_results.insert(0, [from_date, opening.balance])
return _results
def add_missing_dates(incomplete_results, from_date, to_date): def add_missing_dates(incomplete_results, from_date, to_date):
dates = [r[0] for r in incomplete_results] dates = [r[0] for r in incomplete_results]
day_count = date_diff(to_date, from_date) day_count = date_diff(to_date, from_date)