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

[grid reports] now show by wn.route_options

Browse Source
This commit is contained in:
Rushabh Mehta
2013-07-01 14:35:57 +05:30
parent affba2fd99
commit 36af6a02ad
7 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,7 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({
// filter accounts options by company
this.filter_inputs.company.change(function() {
me.setup_account_filter(this);
me.set_route()
me.refresh()
});
this.filter_inputs.account.change(function() {
@@ -220,13 +220,15 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({
}
}
if(date < from_date || item.is_opening=="Yes") {
if(!me.voucher_no && (date < from_date || item.is_opening=="Yes")) {
opening.debit += item.debit;
opening.credit += item.credit;
grouped_ledgers[item.account].opening.debit += item.debit;
grouped_ledgers[item.account].opening.credit += item.credit;
} else if(date <= to_date) {
totals.debit += item.debit;
totals.credit += item.credit;
@@ -242,7 +244,7 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({
+ item.voucher_no][(item.debit > 0 ? "credits" : "debits")].join(", ");
}
if(me.apply_filters(item) && item.is_opening=="No") {
if(me.apply_filters(item) && (me.voucher_no || item.is_opening=="No")) {
out.push(item);
grouped_ledgers[item.account].entries.push(item);