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

Merge branch 'master' of github.com:webnotes/erpnext into 1209

Browse Source 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
This commit is contained in:
Anand Doshi
2012-09-26 12:24:28 +05:30
parent bbab0e4957 0baf74a139
commit 3c4238fc9c
11 changed files with 441 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stock/page/stock_ledger/stock_ledger.js
View File

@@ -175,8 +175,8 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({
if(me.item_code != me.item_code_default && !me.voucher_no) {
var closing = {
item_code: "On " + dateutil.str_to_user(this.to_date),
balance: (out ? out[out.length-1].balance : 0), qty: 0,
balance_value: (out ? out[out.length-1].balance_value : 0),
balance: (out.length ? out[out.length-1].balance : 0), qty: 0,
balance_value: (out.length ? out[out.length-1].balance_value : 0),
id:"_closing", _show: true, _style: "font-weight: bold"
};
total_out.balance_value = -total_out.balance_value;