Merge branch 'master' into edge

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-04-10 19:47:46 +05:30
15 changed files with 33 additions and 94 deletions

View File

@@ -306,10 +306,8 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({
},
make_account_by_name: function() {
if(!this.account_by_name) {
this.account_by_name = this.make_name_map(wn.report_dump.data["Account"]);
this.make_voucher_acconuts_map();
}
this.account_by_name = this.make_name_map(wn.report_dump.data["Account"]);
this.make_voucher_acconuts_map();
},
make_voucher_acconuts_map: function() {