diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index c4f9e8a8ad..d6f2863ba0 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -69,7 +69,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ if(!frm.doc.apply_discount_on) { frappe.msgprint(__("Please set 'Apply Additional Discount On'")); - return + return; } frm.via_discount_percentage = true; @@ -83,17 +83,15 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ var discount_amount = flt(total*flt(frm.doc.additional_discount_percentage) / 100, precision("discount_amount")); - frm.set_value("discount_amount", discount_amount); - delete frm.via_discount_percentage; + frm.set_value("discount_amount", discount_amount) + .then(() => delete frm.via_discount_percentage); }); frappe.ui.form.on(this.frm.doctype, "discount_amount", function(frm) { frm.cscript.set_dynamic_labels(); if (!frm.via_discount_percentage) { - frm.via_discount_amount = true; - frm.set_value("additional_discount_percentage", 0); - delete frm.via_discount_amount; + frm.doc.additional_discount_percentage = 0; } frm.cscript.calculate_taxes_and_totals();