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

Fixes in general ledger report

Browse Source
This commit is contained in:
Nabin Hait 2014-01-03 12:30:24 +05:30
parent a4db83a934
commit 6472bdace2
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accounts/doctype/journal_voucher/journal_voucher.js
View File

@ -120,7 +120,8 @@ cur_frm.cscript.refresh = function(doc) {
"voucher_no": doc.name, "voucher_no": doc.name,
"from_date": doc.posting_date, "from_date": doc.posting_date,
"to_date": doc.posting_date, "to_date": doc.posting_date,
"company": doc.company "company": doc.company,
group_by_voucher: 0
}; };
wn.set_route("query-report", "General Ledger"); wn.set_route("query-report", "General Ledger");
}, "icon-table"); }, "icon-table");

3
accounts/doctype/purchase_invoice/purchase_invoice.js
View File

@ -35,7 +35,8 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
"voucher_no": doc.name, "voucher_no": doc.name,
"from_date": doc.posting_date, "from_date": doc.posting_date,
"to_date": doc.posting_date, "to_date": doc.posting_date,
"company": doc.company "company": doc.company,
group_by_voucher: 0
}; };
wn.set_route("query-report", "General Ledger"); wn.set_route("query-report", "General Ledger");
}, "icon-table"); }, "icon-table");

3
accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -54,7 +54,8 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
"voucher_no": doc.name, "voucher_no": doc.name,
"from_date": doc.posting_date, "from_date": doc.posting_date,
"to_date": doc.posting_date, "to_date": doc.posting_date,
"company": doc.company "company": doc.company,
group_by_voucher: 0
}; };
wn.set_route("query-report", "General Ledger"); wn.set_route("query-report", "General Ledger");
}, "icon-table"); }, "icon-table");

2
accounts/report/general_ledger/general_ledger.py
View File

@ -136,7 +136,7 @@ def get_accountwise_gle(filters, gl_entries, gle_map):
or cstr(gle.is_advance) == "Yes"): or cstr(gle.is_advance) == "Yes"):
gle_map[gle.account].opening += amount gle_map[gle.account].opening += amount
opening += amount opening += amount
elif gle.posting_date < filters.to_date: elif gle.posting_date <= filters.to_date:
gle_map[gle.account].entries.append(gle) gle_map[gle.account].entries.append(gle)
gle_map[gle.account].total_debit += flt(gle.debit) gle_map[gle.account].total_debit += flt(gle.debit)
gle_map[gle.account].total_credit += flt(gle.credit) gle_map[gle.account].total_credit += flt(gle.credit)

3
public/js/controllers/stock_controller.js
View File

@ -28,7 +28,8 @@ erpnext.stock.StockController = wn.ui.form.Controller.extend({
voucher_no: me.frm.doc.name, voucher_no: me.frm.doc.name,
from_date: me.frm.doc.posting_date, from_date: me.frm.doc.posting_date,
to_date: me.frm.doc.posting_date, to_date: me.frm.doc.posting_date,
company: me.frm.doc.company company: me.frm.doc.company,
group_by_voucher: false
}; };
wn.set_route("query-report", "General Ledger"); wn.set_route("query-report", "General Ledger");
}, "icon-table"); }, "icon-table");