From d39f53319d76fd8e734ffac23dbffc0e85effdc8 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 31 Aug 2016 02:09:15 +0530 Subject: [PATCH] Added zero value condition --- erpnext/public/js/controllers/taxes_and_totals.js | 2 +- erpnext/public/js/payment/payments.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index 06298ca477..2149f6d35e 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -588,7 +588,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ payment_status = true; if(this.frm.doc.is_pos && (update_paid_amount===undefined || update_paid_amount)){ $.each(this.frm.doc['payments'] || [], function(index, data){ - if(data.type == "Cash" && payment_status) { + if(data.type == "Cash" && payment_status && total_amount_to_pay > 0) { data.base_amount = flt(total_amount_to_pay, precision("base_amount")); data.amount = flt(total_amount_to_pay / me.frm.doc.conversion_rate, precision("amount")); payment_status = false; diff --git a/erpnext/public/js/payment/payments.js b/erpnext/public/js/payment/payments.js index c5d0749460..438ad7996f 100644 --- a/erpnext/public/js/payment/payments.js +++ b/erpnext/public/js/payment/payments.js @@ -199,7 +199,7 @@ erpnext.payments = erpnext.stock.StockController.extend({ if(me.idx == 'change_amount'){ me.change_amount(value) } else{ - if(flt(value) == 0 && update_write_off) { + if(flt(value) == 0 && update_write_off && me.frm.doc.outstanding_amount > 0) { value = flt(me.frm.doc.outstanding_amount / me.frm.doc.conversion_rate, precision(me.idx)); } me.write_off_amount(value)