From 296c17b7ae525f479585560d44cbabe191f176ec Mon Sep 17 00:00:00 2001 From: Nijil Date: Fri, 18 Nov 2011 14:12:06 +0530 Subject: [PATCH] checking --- .../doctype/purchase_common/purchase_common.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/erpnext/buying/doctype/purchase_common/purchase_common.js b/erpnext/buying/doctype/purchase_common/purchase_common.js index f91b1d88c7..c17623521c 100644 --- a/erpnext/buying/doctype/purchase_common/purchase_common.js +++ b/erpnext/buying/doctype/purchase_common/purchase_common.js @@ -125,6 +125,12 @@ cur_frm.cscript.import_rate = function(doc, cdt, cdn) { cur_frm.cscript.calc_amount(doc, 1); } +//==================== Discount Rate ================================================================ +cur_frm.cscript.discount_rate = function(doc, cdt, cdn) { + // Calculate Amount + cur_frm.cscript.calc_amount(doc, 4); +} + //====================== Calculate Amount ============================================================ /*cur_frm.cscript.calc_amount = function(doc, n) { @@ -245,16 +251,25 @@ cur_frm.cscript.calc_amount = function(doc, n) { set_multiple(tname, cl[i].name, {'purchase_rate': flt(doc.conversion_rate) * flt(cl[i].import_rate) }, fname); set_multiple(tname, cl[i].name, {'amount': flt(flt(cl[i].qty) * flt(doc.conversion_rate) * flt(cl[i].import_rate))}, fname); set_multiple(tname, cl[i].name, {'import_amount': flt(flt(cl[i].qty) * flt(cl[i].import_rate))}, fname); + //dicount value should be changed } if(n == 2){ set_multiple(tname, cl[i].name, {'amount': flt(flt(cl[i].qty) * flt(cl[i].purchase_rate)), 'import_rate': flt(flt(cl[i].purchase_rate) / flt(doc.conversion_rate)) }, fname); set_multiple(tname, cl[i].name, {'import_amount': flt(flt(cl[i].qty) * flt(cl[i].purchase_rate) / flt(doc.conversion_rate))}, fname); - } + //discount value should be changed + } if(n == 3){ set_multiple(tname, cl[i].name, {'purchase_rate': flt(flt(cl[i].amount) / flt(cl[i].qty)) }, fname); set_multiple(tname, cl[i].name, {'import_rate': flt(flt(cl[i].purchase_rate) / flt(doc.conversion_rate))}, fname); set_multiple(tname, cl[i].name, {'import_amount': flt(flt(cl[i].qty) * flt(cl[i].purchase_rate) / flt(doc.conversion_rate))}, fname); } + if( n==4){ + if(cl[i].purchase_ref_rate && !cl[i].import_ref_rate ){ + set_multiple(tname, cl[i].name, {' + } + + + if (n != 3){ net_total += flt(flt(cl[i].qty) * flt(cl[i].purchase_rate)); net_total_import += flt(flt(cl[i].qty) * flt(cl[i].import_rate));