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

[minor] fixes in stock balance report, bin uom and sle is_cancelled

Browse Source
This commit is contained in:
Nabin Hait
2013-10-02 16:29:45 +05:30
parent a37ff498fe
commit a1d1c980bc
7 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/stock_grid_report.js
View File

@@ -29,6 +29,8 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
if(add_qty)
wh.fifo_stack.push([add_qty, sl.incoming_rate, sl.posting_date]);
if(sl.serial_no) value_diff = this.get_serialized_value_diff(sl);
} else {
// outgoing
if(sl.serial_no) {
@@ -98,7 +100,7 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
$.each(sl.serial_no.trim().split("\n"), function(i, sr) {
if(sr) {
value_diff += flt(me.serialized_buying_rates[sr.trim()]);
value_diff += flt(me.serialized_buying_rates[sr.trim().toLowerCase()]);
}
});
@@ -112,7 +114,7 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
if(sle.qty > 0 && sle.serial_no) {
$.each(sle.serial_no.trim().split("\n"), function(i, sr) {
if(sr && sle.incoming_rate !== undefined) {
serialized_buying_rates[sr.trim()] = flt(sle.incoming_rate);
serialized_buying_rates[sr.trim().toLowerCase()] = flt(sle.incoming_rate);
}
});
}