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

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

Browse Source
This commit is contained in:
Nabin Hait
2013-11-18 12:43:24 +05:30
parent 48bd4a1ded b5a58c8a8f
commit dd9e7a44df
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/stock_analytics.js
View File

@@ -11,7 +11,7 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({
parent: $(wrapper).find('.layout-main'), parent: $(wrapper).find('.layout-main'),
appframe: wrapper.appframe, appframe: wrapper.appframe,
doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand", doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand",
"Fiscal Year"], "Fiscal Year", "Serial No"],
tree_grid: { tree_grid: {
show: true, show: true,
parent_field: "parent_item_group", parent_field: "parent_item_group",

20
public/js/stock_grid_report.js
View File

@@ -14,7 +14,7 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
// value // value
if(sl.qty > 0) { if(sl.qty > 0) {
// incoming - rate is given // incoming - rate is given
var rate = sl.incoming_rate; var rate = sl.incoming_rate;
var add_qty = sl.qty; var add_qty = sl.qty;
if(wh.balance_qty < 0) { if(wh.balance_qty < 0) {
// negative valuation // negative valuation
@@ -34,11 +34,14 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
if(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 { } else {
// called everytime for maintaining fifo stack
var fifo_value_diff = this.get_fifo_value_diff(wh, sl);
// outgoing // outgoing
if(sl.serial_no) { if(sl.serial_no) {
var value_diff = -1 * this.get_serialized_value_diff(sl); var value_diff = -1 * this.get_serialized_value_diff(sl);
} else if(is_fifo) { } else if(is_fifo) {
var value_diff = this.get_fifo_value_diff(wh, sl); var value_diff = fifo_value_diff;
} else { } else {
// average rate for weighted average // average rate for weighted average
var rate = (wh.balance_qty.toFixed(2) == 0.00 ? 0 : var rate = (wh.balance_qty.toFixed(2) == 0.00 ? 0 :
@@ -84,11 +87,6 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
qty = qty - batch[0]; qty = qty - batch[0];
} }
} }
if(qty) {
// msgprint("Negative values not allowed for FIFO valuation!\
// Item " + sl.item_code.bold() + " on " + dateutil.str_to_user(sl.posting_datetime).bold() +
// " becomes negative. Values computed will not be accurate.");
}
// reset the updated stack // reset the updated stack
wh.fifo_stack = fifo_stack.reverse(); wh.fifo_stack = fifo_stack.reverse();
@@ -112,9 +110,11 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
get_serialized_buying_rates: function() { get_serialized_buying_rates: function() {
var serialized_buying_rates = {}; var serialized_buying_rates = {};
$.each(wn.report_dump.data["Serial No"], function(i, sn) { if (wn.report_dump.data["Serial No"]) {
serialized_buying_rates[sn.name.toLowerCase()] = flt(sn.incoming_rate); $.each(wn.report_dump.data["Serial No"], function(i, sn) {
}); serialized_buying_rates[sn.name.toLowerCase()] = flt(sn.incoming_rate);
});
}
return serialized_buying_rates; return serialized_buying_rates;
}, },

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

@@ -25,7 +25,7 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({
page: wrapper, page: wrapper,
parent: $(wrapper).find('.layout-main'), parent: $(wrapper).find('.layout-main'),
appframe: wrapper.appframe, appframe: wrapper.appframe,
doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Item Group", "Brand"], doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Item Group", "Brand", "Serial No"],
}) })
}, },
setup_columns: function() { setup_columns: function() {
@@ -175,7 +175,7 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({
grid: { hoverable: true, clickable: true }, grid: { hoverable: true, clickable: true },
xaxis: { xaxis: {
ticks: $.map(me.data, function(item, idx) { return [[idx+1, item.name]] }), ticks: $.map(me.data, function(item, idx) { return [[idx+1, item.name]] }),
max: 20 max: 15
}, },
series: { downsample: { threshold: 1000 } } series: { downsample: { threshold: 1000 } }
} }

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

@@ -21,7 +21,7 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({
page: wrapper, page: wrapper,
parent: $(wrapper).find('.layout-main'), parent: $(wrapper).find('.layout-main'),
appframe: wrapper.appframe, appframe: wrapper.appframe,
doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand"], doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand", "Serial No"],
}) })
}, },

2
stock/page/stock_level/stock_level.js
View File

@@ -27,7 +27,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
parent: $(wrapper).find('.layout-main'), parent: $(wrapper).find('.layout-main'),
appframe: wrapper.appframe, appframe: wrapper.appframe,
doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Production Order", doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Production Order",
"Material Request Item", "Purchase Order Item", "Sales Order Item", "Brand"], "Material Request Item", "Purchase Order Item", "Sales Order Item", "Brand", "Serial No"],
}); });
this.wrapper.bind("make", function() { this.wrapper.bind("make", function() {