nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into edge

Browse Source 
Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt
This commit is contained in:
Anand Doshi
2013-04-16 21:32:06 +05:30
parent edfeade5a6 aa7a386db9
commit c6aecb3f97
22 changed files with 465 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
accounts/page/general_ledger/general_ledger.js
View File

@@ -307,10 +307,10 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({
make_account_by_name: function() {
this.account_by_name = this.make_name_map(wn.report_dump.data["Account"]);
this.make_voucher_acconuts_map();
this.make_voucher_accounts_map();
},
make_voucher_acconuts_map: function() {
make_voucher_accounts_map: function() {
this.voucher_accounts = {};
var data = wn.report_dump.data["GL Entry"];
for(var i=0, j=data.length; i<j; i++) {