X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_entry_items.php;h=13897245858c748ca00511d8c23f1137dd5796b9;hb=d7b4faaf04d4cc90fb15f344840e916feed5765a;hp=be2393ae774eaa8285b4a44803bf08bd07f6e022;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index be2393ae..13897245 100644
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -3,16 +3,13 @@
 $page_security = 4;
 
 $path_to_root="..";
-include($path_to_root . "/purchasing/includes/po_class.inc");
+include_once($path_to_root . "/purchasing/includes/po_class.inc");
 
-include($path_to_root . "/includes/session.inc");
-
-include($path_to_root . "/includes/data_checks.inc");
-include($path_to_root . "/includes/manufacturing.inc");
+include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
 
-$js = get_js_form_entry("StockID2", "stock_id", "qty");
+$js = '';
 if ($use_popup_windows)
 	$js .= get_js_open_window(900, 500);
 if ($use_date_picker)
@@ -153,24 +150,23 @@ if (isset($_GET['Delete']))
 
 function check_data()
 {
-    if (!is_numeric($_POST['qty']))
+    if (!check_num('qty',0))
     {
-	   	display_error(_("The quantity of the order item must be numeric."));
+	   	display_error(_("The quantity of the order item must be numeric and not less than zero."));
+		set_focus('qty');
 	   	return false;
     }
-    if ($_POST['qty'] <= 0)
-    {
-	   	display_error(_("The quantity of the ordered item entered must be a positive amount."));
-	   	return false;	   
-    }
-    if (!is_numeric($_POST['price']))
+
+    if (!check_num('price', 0))
     {
-	   	display_error(_("The price entered must be numeric."));
+	   	display_error(_("The price entered must be numeric and not less than zero."));
+		set_focus('price');
 	   	return false;	   
     }
     if (!is_date($_POST['req_del_date'])){
-    	display_error(_("The date entered is in an invalid format."));
-	   	return false;    	 
+    		display_error(_("The date entered is in an invalid format."));
+		set_focus('req_del_date');
+   		return false;    	 
     }
      
     return true;	
@@ -183,15 +179,16 @@ function handle_update_item()
 	$allow_update = check_data(); 
 
 	if ($allow_update && 
-		($_SESSION['PO']->line_items[$_POST['line_no']]->qty_inv > $_POST['qty'] ||
-		$_SESSION['PO']->line_items[$_POST['line_no']]->qty_received > $_POST['qty']))
+		($_SESSION['PO']->line_items[$_POST['line_no']]->qty_inv > input_num('qty') ||
+		$_SESSION['PO']->line_items[$_POST['line_no']]->qty_received > input_num('qty')))
 	{
 		display_error(_("You are attempting to make the quantity ordered a quantity less than has already been invoiced or received.  This is prohibited.") .
 			"<br>" . _("The quantity received can only be modified by entering a negative receipt and the quantity invoiced can only be reduced by entering a credit note against this item."));
+		set_focus('qty');
 		return;
 	}
 	
-	$_SESSION['PO']->update_order_item($_POST['line_no'], $_POST['qty'], $_POST['price'],
+	$_SESSION['PO']->update_order_item($_POST['line_no'], input_num('qty'), input_num('price'),
   		$_POST['req_del_date']);
 	unset_form_variables();
 }
@@ -235,8 +232,8 @@ function handle_add_new_item()
 			if ($allow_update)
 		   	{
 				$myrow = db_fetch($result);
-				$_SESSION['PO']->add_to_order ($_POST['line_no'], $_POST['stock_id'], $_POST['qty'], 
-					$myrow["description"], $_POST['price'], $myrow["units"],
+				$_SESSION['PO']->add_to_order ($_POST['line_no'], $_POST['stock_id'], input_num('qty'), 
+					$myrow["description"], input_num('price'), $myrow["units"],
 					$_POST['req_del_date'], 0, 0);
 
 				unset_form_variables();
@@ -258,6 +255,7 @@ function can_commit()
 	if (!is_date($_POST['OrderDate'])) 
 	{
 		display_error(_("The entered order date is invalid."));
+		set_focus('OrderDate');
 		return false;
 	} 
 	
@@ -266,12 +264,14 @@ function can_commit()
     	if (!references::is_valid($_SESSION['PO']->reference)) 
     	{
     		display_error(_("There is no reference entered for this purchase order."));
+		set_focus('ref');
     		return false;
     	} 
     	
     	if (!is_new_reference($_SESSION['PO']->reference, systypes::po())) 
     	{
     		display_error(_("The entered reference is already in use."));
+		set_focus('ref');
     		return false;
     	}
 	}
@@ -279,12 +279,14 @@ function can_commit()
 	if ($_SESSION['PO']->delivery_address == "")
 	{
 		display_error(_("There is no delivery address specified."));
+		set_focus('delivery_address');
 		return false;
 	} 
 	
 	if (!isset($_SESSION['PO']->Location) || $_SESSION['PO']->Location == "")
 	{
 		display_error(_("There is no location specified to move any items into."));
+		set_focus('StkLocation');
 		return false;
 	}