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

Added zero value condition

Browse Source
This commit is contained in:
Rohit Waghchaure 2016-08-31 02:09:15 +05:30
parent 609e2b4ca3
commit d39f53319d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/public/js/controllers/taxes_and_totals.js
View File

@ -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;

2
erpnext/public/js/payment/payments.js
View File

@ -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)