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

stock balance report and inclusion of filter on brand in all stock reports

Browse Source
This commit is contained in:
Nabin Hait
2012-12-25 18:04:10 +05:30
parent 9deda0e5b1
commit ce159ab66b
10 changed files with 329 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/stock_grid_report.js
View File

@@ -41,12 +41,12 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
var value_diff = (rate * add_qty);
if(add_qty)
wh.fifo_stack.push([add_qty, sl.incoming_rate, sl.posting_date]);
wh.fifo_stack.push([add_qty, sl.incoming_rate, sl.posting_date]);
} else {
// outgoing
if(is_fifo) {
var value_diff = this.get_fifo_value_diff(wh, sl);
var value_diff = this.get_fifo_value_diff(wh, sl);
} else {
// average rate for weighted average
var rate = (wh.balance_qty.toFixed(2) == 0.00 ? 0 :
@@ -54,7 +54,7 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
// no change in value if negative qty
if((wh.balance_qty + sl.qty).toFixed(2) >= 0.00)
var value_diff = (rate * sl.qty);
var value_diff = (rate * sl.qty);
else
var value_diff = -wh.balance_value;
}