From b073cf4fa164c3f67fab6c3ef27b3982ca69e0bb Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 8 Mar 2016 17:59:04 +0530 Subject: [PATCH] [fix] POS amount_paid when not cash - Fixes #4686, #4828, #4289 --- erpnext/public/js/pos/pos.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/public/js/pos/pos.js b/erpnext/public/js/pos/pos.js index b8a6d32a0b..4e3898f865 100644 --- a/erpnext/public/js/pos/pos.js +++ b/erpnext/public/js/pos/pos.js @@ -433,7 +433,8 @@ erpnext.pos.PointOfSale = Class.extend({ options: me.modes_of_payment.join('\n'), reqd: 1, "default": default_mode}, {fieldtype:'Currency', fieldname:'paid_amount', label:__('Amount Paid'), - reqd:1, "default": me.frm.doc.grand_total, hidden: 1, change: function() { + reqd:1, "default": me.frm.doc.grand_total, + change: function() { var values = dialog.get_values(); var actual_change = flt(values.paid_amount - values.total_amount, @@ -480,6 +481,9 @@ erpnext.pos.PointOfSale = Class.extend({ // set to nearest 5 dialog.set_value("paid_amount", dialog.get_value("total_amount")); dialog.get_input("paid_amount").trigger("change"); + } else if (!is_cash) { + dialog.set_value("paid_amount", dialog.get_value("total_amount")); + dialog.set_value("change", 0); } }).trigger("change");