Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-02-17 17:11:26 +05:30
parent 9aafe76f63
commit 3efc6ab94d
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@ -145,6 +145,11 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
var d = locals[cdt][cdn]; var d = locals[cdt][cdn];
d.transfer_qty = flt(d.qty) * flt(d.conversion_factor); d.transfer_qty = flt(d.qty) * flt(d.conversion_factor);
refresh_field('items'); refresh_field('items');
calculate_total(doc, cdt, cdn);
},
incoming_rate: function(doc, cdt, cdn) {
calculate_total(doc, cdt, cdn);
}, },
production_order: function() { production_order: function() {
@ -479,16 +484,13 @@ cur_frm.cscript.posting_date = function(doc, cdt, cdn){
var calculate_total = function(doc, cdt, cdn){ var calculate_total = function(doc, cdt, cdn){
var d = locals[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); frappe.model.set_value(cdt, cdn, 'amount', amount);
return frappe.call({ var total_amount = 0.0;
doc: cur_frm.doc, var items = doc.items || [];
method: "set_total_amount", for(var i=0;i<items.length;i++) {
callback: function(r) { total_amount += flt(items[i].amount);
refresh_field('total_amount'); }
} doc.total_amount = total_amount;
}); refresh_field("total_amount");
} }
cur_frm.cscript.incoming_rate = calculate_total;
cur_frm.cscript.qty = calculate_total;