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

Added total debit / credit row in trial balance. Fixes #1313

Browse Source
This commit is contained in:
Nabin Hait 2014-06-04 18:02:16 +05:30
parent deb6e06336
commit 4d4df03f88
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,9 +256,6 @@ erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({
}
});
this.data.push(net_profit);
// $.each(me.data, function(i, v) {
// if(v.report_type=="Profit and Loss") console.log(v)
// })
}
},
add_balance: function(field, account, gl) {

27
erpnext/accounts/page/trial_balance/trial_balance.js
View File

@ -29,6 +29,7 @@ frappe.pages['trial-balance'].onload = function(wrapper) {
this.with_period_closing_entry = this.wrapper
.find(".with_period_closing_entry input:checked").length;
this._super();
this.add_total_debit_credit();
},
update_balances: function(account, posting_date, v) {
@ -42,6 +43,32 @@ frappe.pages['trial-balance'].onload = function(wrapper) {
this._super(account, posting_date, v);
}
},
add_total_debit_credit: function() {
var me = this;
var total_row = {
company: me.company,
id: "Total Debit / Credit",
name: "Total Debit / Credit",
indent: 0,
opening_dr: "NA",
opening_cr: "NA",
debit: 0,
credit: 0,
checked: false,
};
me.item_by_name[total_row.name] = total_row;
$.each(this.data, function(i, account) {
if((account.group_or_ledger == "Ledger") || (account.rgt - account.lft == 1)) {
total_row["debit"] += account.debit;
total_row["credit"] += account.credit;
}
});
this.data.push(total_row);
}
})
erpnext.trial_balance = new TrialBalance(wrapper, 'Trial Balance');