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

Financial analytics graph fix #1542

Browse Source
This commit is contained in:
Nabin Hait 2014-05-04 16:02:26 +05:30
parent 232954d4b9
commit a096b2004f
1 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/page/financial_analytics/financial_analytics.js
View File

@ -82,7 +82,7 @@ erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({
date: date, date: date,
balance_type: balance_type, balance_type: balance_type,
formatter: me.currency_formatter, formatter: me.currency_formatter,
width: 100 width: 110
}); });
} }
@ -313,9 +313,9 @@ erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({
var bal = account[col.date+"_dr"]||account[col.date+"_cr"]; var bal = account[col.date+"_dr"]||account[col.date+"_cr"];
if (pl_or_bs != "Balance Sheet") { if (pl_or_bs != "Balance Sheet") {
return [[dateutil.str_to_obj(col.date).getTime(), bal], return [[dateutil.str_to_obj(col.date).getTime(), bal],
[dateutil.user_to_obj(col.date).getTime(), bal]]; [dateutil.str_to_obj(col.date).getTime(), bal]];
} else { } else {
return [[dateutil.user_to_obj(col.date).getTime(), bal]]; return [[dateutil.str_to_obj(col.date).getTime(), bal]];
} }
} }
}), }),
@ -330,7 +330,6 @@ erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({
} }
} }
}); });
return data; return data;
} }
}) })