X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=de86600d802e644e54bbb13bc11ff25f732437bb;hb=0b0690657989cd259e5966faaac7cacbfa89cee2;hp=cd48b65805823dd7e8ea64af78d564572616a742;hpb=0c1bcd8ce3c089d7ddb3722a097f8fc8417f41e6;p=fa-stable.git

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index cd48b658..de86600d 100644
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -49,38 +49,41 @@ function can_process()
 {
 	if (!isset($_POST['DateBanked']) || !is_date($_POST['DateBanked'])) {
 		display_error(_("The entered date is invalid. Please enter a valid date for the payment."));
+		set_focus('DateBanked');
 		return false;
 	} elseif (!is_date_in_fiscalyear($_POST['DateBanked'])) {
 		display_error(_("The entered date is not in fiscal year."));
+		set_focus('DateBanked');
 		return false;
 	}
 
 	if (!references::is_valid($_POST['ref'])) {
 		display_error(_("You must enter a reference."));
+		set_focus('ref');
 		return false;
 	}
 
 	if (!is_new_reference($_POST['ref'], 12)) {
 		display_error(_("The entered reference is already in use."));
+		set_focus('ref');
 		return false;
 	}
 
-	if ((!is_numeric($_POST['amount']) || $_POST['amount'] < 0)) {
+	if (!check_num('amount', 0)) {
 		display_error(_("The entered amount is invalid or negative and cannot be processed."));
+		set_focus('amount');
 		return false;
 	}
 
-	if (!isset($_POST['discount']) || ($_POST['discount'] == "")) {
-		$_POST['discount'] = 0;
-	}
-
-	if (!is_numeric($_POST['discount'])) {
+	if (!check_num('discount')) {
 		display_error(_("The entered discount is not a valid number."));
+		set_focus('discount');
 		return false;
 	}
 
-	if (($_POST['amount'] - $_POST['discount'] <= 0)) {
+	if ((input_num('amount') - input_num('discount') <= 0)) {
 		display_error(_("The balance of the amount and discout is zero or negative. Please enter valid amounts."));
+		set_focus('discount');
 		return false;
 	}
 
@@ -102,7 +105,7 @@ if (isset($_POST['AddPaymentItem'])) {
 if (isset($_POST['AddPaymentItem'])) {
 	$payment_no = write_customer_payment(0, $_POST['customer_id'], $_POST['BranchID'],
 		$_POST['bank_account'], $_POST['DateBanked'], $_POST['ReceiptType'], $_POST['ref'],
-		$_POST['amount'], $_POST['discount'], $_POST['memo_']);
+		input_num('amount'), input_num('discount'), $_POST['memo_']);
 
 	meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no");
 }
@@ -160,7 +163,7 @@ function display_item_form()
 		echo "</table></table>";
 		display_note(_("This customer account is on hold."), 0, 0, "class='redfb'");
 	} else {
-		$display_discount_percent = number_format2($_POST['pymt_discount']*100,user_price_dec()) . "%";
+		$display_discount_percent = percent_format($_POST['pymt_discount']*100) . "%";
 
 		amount_row(_("Amount:"), 'amount');