Fixed conflict while merging v4 into v5

2015-02-10 16:37:18 +05:30
parent 2813f38c5a eac82039e3
commit 15cd12214e
55 changed files with 7612 additions and 3974 deletions
--- a/erpnext/public/js/pos/pos.js
+++ b/erpnext/public/js/pos/pos.js
@@ -18,7 +18,7 @@ erpnext.pos.PointOfSale = Class.extend({
 		});

 		this.wrapper.find('input.discount-amount').on("change", function() {
-			frappe.model.set_value(me.frm.doctype, me.frm.docname, "discount_amount", this.value);
+			frappe.model.set_value(me.frm.doctype, me.frm.docname, "discount_amount", flt(this.value));
 		});
 	},
 	check_transaction_type: function() {