From 9aafe76f6300677bf1f700270e0f37f58e347322 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Fri, 13 Feb 2015 15:31:20 +0530 Subject: [PATCH 1/3] client side - recalculate amount and total amount on change of qty or valuation reate of the item --- erpnext/stock/doctype/stock_entry/stock_entry.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index a77aa748ea..58001bd9a5 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -476,3 +476,19 @@ cur_frm.cscript.company = function(doc, cdt, cdn) { cur_frm.cscript.posting_date = function(doc, cdt, cdn){ erpnext.get_fiscal_year(doc.company, doc.posting_date); } + +var calculate_total = function(doc, cdt, cdn){ + var d = locals[cdt][cdn]; + amount = d.incoming_rate * d.qty + frappe.model.set_value(cdt, cdn, 'amount', amount); + return frappe.call({ + doc: cur_frm.doc, + method: "set_total_amount", + callback: function(r) { + refresh_field('total_amount'); + } + }); +} + +cur_frm.cscript.incoming_rate = calculate_total; +cur_frm.cscript.qty = calculate_total; From 3efc6ab94d2955bbbfd5c9ae66a366b26ee338ad Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Tue, 17 Feb 2015 17:11:26 +0530 Subject: [PATCH 2/3] fixes --- .../stock/doctype/stock_entry/stock_entry.js | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 58001bd9a5..75dbfc8ff4 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -145,6 +145,11 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({ var d = locals[cdt][cdn]; d.transfer_qty = flt(d.qty) * flt(d.conversion_factor); refresh_field('items'); + calculate_total(doc, cdt, cdn); + }, + + incoming_rate: function(doc, cdt, cdn) { + calculate_total(doc, cdt, cdn); }, production_order: function() { @@ -479,16 +484,13 @@ cur_frm.cscript.posting_date = function(doc, cdt, cdn){ var calculate_total = function(doc, cdt, cdn){ var d = locals[cdt][cdn]; - amount = d.incoming_rate * d.qty + amount = flt(d.incoming_rate) * flt(d.qty) frappe.model.set_value(cdt, cdn, 'amount', amount); - return frappe.call({ - doc: cur_frm.doc, - method: "set_total_amount", - callback: function(r) { - refresh_field('total_amount'); - } - }); + var total_amount = 0.0; + var items = doc.items || []; + for(var i=0;i Date: Wed, 18 Feb 2015 12:07:09 +0530 Subject: [PATCH 3/3] fixes --- erpnext/stock/doctype/stock_entry/stock_entry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 75dbfc8ff4..6e4530f16b 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -484,7 +484,7 @@ cur_frm.cscript.posting_date = function(doc, cdt, cdn){ var calculate_total = function(doc, cdt, cdn){ var d = locals[cdt][cdn]; - amount = flt(d.incoming_rate) * flt(d.qty) + amount = flt(d.incoming_rate) * flt(d.transfer_qty) frappe.model.set_value(cdt, cdn, 'amount', amount); var total_amount = 0.0; var items = doc.items || [];