nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix][report] general ledger

Browse Source
This commit is contained in:
Nabin Hait
2013-06-25 14:08:18 +05:30
parent ec1f69ddb9
commit 909e8b120f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,7 +232,6 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({
grouped_ledgers[item.account].totals.debit += item.debit; grouped_ledgers[item.account].totals.debit += item.debit;
grouped_ledgers[item.account].totals.credit += item.credit; grouped_ledgers[item.account].totals.credit += item.credit;
grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no] grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no]
.totals.debit += item.debit; .totals.debit += item.debit;
grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no] grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no]
@@ -248,8 +247,8 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({
grouped_ledgers[item.account].entries.push(item); grouped_ledgers[item.account].entries.push(item);
if(grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no].row){ if(grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no].row){
grouped_ledgers[item.account]. grouped_ledgers[item.account].entries_group_by_voucher[item.voucher_no]
entries_group_by_voucher[item.voucher_no].row = item; .row = jQuery.extend({}, item);
} }
} }
} }
@@ -321,7 +320,7 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({
$.each(Object.keys(grouped_ledgers).sort(), function(i, account) { $.each(Object.keys(grouped_ledgers).sort(), function(i, account) {
if(grouped_ledgers[account].entries.length) { if(grouped_ledgers[account].entries.length) {
$.each(Object.keys(grouped_ledgers[account].entries_group_by_voucher).sort(), $.each(Object.keys(grouped_ledgers[account].entries_group_by_voucher).sort(),
function(j, voucher) { function(j, voucher) {
voucher_dict = grouped_ledgers[account].entries_group_by_voucher[voucher]; voucher_dict = grouped_ledgers[account].entries_group_by_voucher[voucher];
if(voucher_dict.totals.debit || voucher_dict.totals.credit) { if(voucher_dict.totals.debit || voucher_dict.totals.credit) {
voucher_dict.row.debit = voucher_dict.totals.debit; voucher_dict.row.debit = voucher_dict.totals.debit;