X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fsupplier_payment.php;h=4c99f95d00aef928f0f146b8950baecbf1540c7a;hb=41069728f318cd75cfecce474a7ac464e2894615;hp=d92973570efb4a39f2b44095f321d2f2c930af36;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git

diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php
index d9297357..4c99f95d 100644
--- a/purchasing/supplier_payment.php
+++ b/purchasing/supplier_payment.php
@@ -41,16 +41,11 @@ if (isset($_GET['AddedID']))
 
     display_note(get_gl_view_str(22, $payment_id, _("View the GL Journal Entries for this Payment")));
 
-	echo "<center><br>";
     hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("Allocate this Payment"), "trans_no=$payment_id&trans_type=22");
 
-   	echo "<br><br>";
 	hyperlink_params($_SERVER['PHP_SELF'], _("Enter another supplier payment"), "supplier_id=" . $_POST['supplier_id']);
 
-   	echo "</center><br><br>";
-
-	end_page();
- 	exit;
+	display_footer_exit();
 }
 
 //----------------------------------------------------------------------------------------
@@ -122,12 +117,13 @@ function check_inputs()
 {
 	if ($_POST['amount'] == "") 
 	{
-		$_POST['amount'] = 0;
+		$_POST['amount'] = price_format(0);
 	}
 
-	if (!is_numeric($_POST['amount']) || $_POST['amount'] < 0) 
+	if (!check_num('amount', 0))
 	{
 		display_error(_("The entered amount is invalid or less than zero."));
+		set_focus('amount');
 		return false;
 	}
 
@@ -136,37 +132,43 @@ function check_inputs()
 		$_POST['discount'] = 0;
 	}
 
-	if (!is_numeric($_POST['discount']) OR $_POST['discount'] < 0) 
+	if (!check_num('discount', 0))
 	{
 		display_error(_("The entered discount is invalid or less than zero."));
+		set_focus('amount');
 		return false;
 	}
 
-	if ($_POST['amount'] - $_POST['discount'] <= 0) 
+	if (input_num('amount') - input_num('discount') <= 0) 
 	{
 		display_error(_("The total of the amount and the discount negative. Please enter positive values."));
+		set_focus('amount');
 		return false;
 	}
 
    	if (!is_date($_POST['DatePaid']))
    	{
 		display_error(_("The entered date is invalid."));
+		set_focus('DatePaid');
 		return false;
 	} 
 	elseif (!is_date_in_fiscalyear($_POST['DatePaid'])) 
 	{
 		display_error(_("The entered date is not in fiscal year."));
+		set_focus('DatePaid');
 		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'], 22)) 
 	{
 		display_error(_("The entered reference is already in use."));
+		set_focus('ref');
 		return false;
 	}
 
@@ -179,7 +181,7 @@ function handle_add_payment()
 {
 	$payment_id = add_supp_payment($_POST['supplier_id'], $_POST['DatePaid'],
 		$_POST['PaymentType'], $_POST['bank_account'],
-		$_POST['amount'], $_POST['discount'], $_POST['ref'], $_POST['memo_']);
+		input_num('amount'), input_num('discount'), $_POST['ref'], $_POST['memo_']);
 
 	//unset($_POST['supplier_id']);
    	unset($_POST['bank_account']);