diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.js b/erpnext/selling/page/point_of_sale/point_of_sale.js
index 70e45f9..bc7ebf3 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.js
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.js
@@ -464,7 +464,7 @@
 					if (r.message) {
 						this.frm.meta.default_print_format = r.message.print_format || 'POS Invoice';
 						this.frm.allow_edit_rate = r.message.allow_edit_rate;
-            			this.frm.allow_edit_discount = r.message.allow_edit_discount;
+						this.frm.allow_edit_discount = r.message.allow_edit_discount;
 					}
 				}
 
@@ -585,6 +585,7 @@
 		this.numpad && this.numpad.reset_value();
 		this.customer_field.set_value("");
 
+		this.$discount_amount.find('input:text').val('');
 		this.wrapper.find('.grand-total-value').text(
 			format_currency(this.frm.doc.grand_total, this.frm.currency));
 		this.wrapper.find('.rounded-total-value').text(
@@ -715,19 +716,15 @@
 		this.customer_field.set_value(this.frm.doc.customer);
 	}
 
-  	disable_numpad_control() {
-		if(!this.frm.allow_edit_rate && !this.frm.allow_edit_discount) {
-			return ['Rate', 'Disc'];
+	disable_numpad_control() {
+		let disabled_btns = [];
+		if(!this.frm.allow_edit_rate) {
+			disabled_btns.push('Rate');
 		}
-		if(!this.frm.allow_edit_rate || !this.frm.allow_edit_discount) {
-			if(!this.frm.allow_edit_rate) {
-				return ['Rate'];
-			} else {
-				return ['Disc'];
-			}
-		} else {
-			return [];
+		if(!this.frm.allow_edit_discount) {
+			disabled_btns.push('Disc');
 		}
+		return disabled_btns;
 	}
 
 	make_numpad() {