nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] merge conflict fixed

Browse Source
This commit is contained in:
Nabin Hait
2013-11-21 12:28:50 +05:30
parent ad45e31356 e5a1a84d8d
commit 8eb0c61649
25 changed files with 225 additions and 226 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'),
appframe: wrapper.appframe,
doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand",
"Fiscal Year"],
"Fiscal Year", "Serial No"],
tree_grid: {
show: true,
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
if(sl.qty > 0) {
// incoming - rate is given
var rate = sl.incoming_rate;
var rate = sl.incoming_rate;
var add_qty = sl.qty;
if(wh.balance_qty < 0) {
// negative valuation
@@ -34,11 +34,14 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
if(add_qty)
wh.fifo_stack.push([add_qty, sl.incoming_rate, sl.posting_date]);
} else {
// called everytime for maintaining fifo stack
var fifo_value_diff = this.get_fifo_value_diff(wh, sl);
// outgoing
if(sl.serial_no) {
var value_diff = -1 * this.get_serialized_value_diff(sl);
} else if(is_fifo) {
var value_diff = this.get_fifo_value_diff(wh, sl);
var value_diff = fifo_value_diff;
} else {
// average rate for weighted average
var rate = (wh.balance_qty.toFixed(2) == 0.00 ? 0 :
@@ -84,11 +87,6 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
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
wh.fifo_stack = fifo_stack.reverse();
@@ -112,9 +110,11 @@ erpnext.StockGridReport = wn.views.TreeGridReport.extend({
get_serialized_buying_rates: function() {
var serialized_buying_rates = {};
$.each(wn.report_dump.data["Serial No"], function(i, sn) {
serialized_buying_rates[sn.name.toLowerCase()] = flt(sn.incoming_rate);
});
if (wn.report_dump.data["Serial No"]) {
$.each(wn.report_dump.data["Serial No"], function(i, sn) {
serialized_buying_rates[sn.name.toLowerCase()] = flt(sn.incoming_rate);
});
}
return serialized_buying_rates;
},