X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_entry_items.php;h=2f903ba12be839caa38e95236ec79283cf17f080;hb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;hp=3c9976be61ea9ad0d594703c91d5d8f1f18a6c24;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 3c9976be..2f903ba1 100644
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -1,20 +1,26 @@
 <?php
-
-$page_security = 4;
-
-$path_to_root="..";
-include($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");
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_PURCHASEORDER';
+$path_to_root = "..";
+include_once($path_to_root . "/purchasing/includes/po_class.inc");
+include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/purchasing/includes/purchasing_ui.inc");
+include_once($path_to_root . "/reporting/includes/reporting.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)
+	$js .= get_js_date_picker();
 
 if (isset($_GET['ModifyOrderNumber'])) 
 {
@@ -36,26 +42,40 @@ check_db_has_purchasable_items(_("There are no purchasable inventory items defin
 if (isset($_GET['AddedID'])) 
 {
 	$order_no = $_GET['AddedID'];
-	$trans_type = systypes::po();	
+	$trans_type = ST_PURCHORDER;	
 
 	if (!isset($_GET['Updated']))
 		display_notification_centered(_("Purchase Order has been entered"));
 	else
 		display_notification_centered(_("Purchase Order has been updated") . " #$order_no");
-	display_note(get_trans_view_str($trans_type, $order_no, _("View this order")));
+	display_note(get_trans_view_str($trans_type, $order_no, _("&View this order")), 0, 1);
 
-	hyperlink_params($path_to_root . "/purchasing/po_receive_items.php", _("Receive Items on this Purchase Order"), "PONumber=$order_no");
+	display_note(print_document_link($order_no, _("&Print This Order"), true, $trans_type), 0, 1);
 
-	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Purchase Order"), "NewOrder=yes");
+	display_note(print_document_link($order_no, _("&Email This Order"), true, $trans_type, false, "", "", 1));
+
+	hyperlink_params($path_to_root . "/purchasing/po_receive_items.php", _("&Receive Items on this Purchase Order"), "PONumber=$order_no");
+
+	hyperlink_params($_SERVER['PHP_SELF'], _("Enter &Another Purchase Order"), "NewOrder=yes");
 	
-	hyperlink_no_params($path_to_root."/purchasing/inquiry/po_search.php", _("Select An Outstanding Purchase Order"));
+	hyperlink_no_params($path_to_root."/purchasing/inquiry/po_search.php", _("Select An &Outstanding Purchase Order"));
 	
 	display_footer_exit();	
 }
-
 //--------------------------------------------------------------------------------------------------
 
-function copy_to_po()
+function copy_from_cart()
+{
+	$_POST['supplier_id'] = $_SESSION['PO']->supplier_id;	
+	$_POST['OrderDate'] = $_SESSION['PO']->orig_order_date;	
+    $_POST['Requisition'] = $_SESSION['PO']->requisition_no;
+    $_POST['ref'] = $_SESSION['PO']->reference;
+	$_POST['Comments'] = $_SESSION['PO']->Comments;
+    $_POST['StkLocation'] = $_SESSION['PO']->Location;
+    $_POST['delivery_address'] = $_SESSION['PO']->delivery_address;	
+}
+
+function copy_to_cart()
 {
 	$_SESSION['PO']->supplier_id = $_POST['supplier_id'];	
 	$_SESSION['PO']->orig_order_date = $_POST['OrderDate'];
@@ -65,20 +85,14 @@ function copy_to_po()
 	$_SESSION['PO']->Location = $_POST['StkLocation'];
 	$_SESSION['PO']->delivery_address = $_POST['delivery_address'];
 }
-
 //--------------------------------------------------------------------------------------------------
 
-function copy_from_po()
-{
-	$_POST['supplier_id'] = $_SESSION['PO']->supplier_id;	
-	$_POST['OrderDate'] = $_SESSION['PO']->orig_order_date;	
-    $_POST['Requisition'] = $_SESSION['PO']->requisition_no;
-    $_POST['ref'] = $_SESSION['PO']->reference;
-	$_POST['Comments'] = $_SESSION['PO']->Comments;
-    $_POST['StkLocation'] = $_SESSION['PO']->Location;
-    $_POST['delivery_address'] = $_SESSION['PO']->delivery_address;	
-}
+function line_start_focus() {
+  global 	$Ajax;
 
+  $Ajax->activate('items_table');
+  set_focus('_stock_id_edit');
+}
 //--------------------------------------------------------------------------------------------------
 
 function unset_form_variables() {
@@ -90,9 +104,8 @@ function unset_form_variables() {
 
 //---------------------------------------------------------------------------------------------------
 
-function handle_delete_item()
+function handle_delete_item($line_no)
 {
-	$line_no = $_GET['Delete'];
 	if($_SESSION['PO']->some_already_received($line_no) == 0)
 	{
 		$_SESSION['PO']->remove_from_order($line_no);
@@ -102,6 +115,7 @@ function handle_delete_item()
 	{
 		display_error(_("This item cannot be deleted because some of it has already been received."));
 	}	
+    line_start_focus();
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -122,12 +136,15 @@ function handle_cancel_po()
 	if($_SESSION['PO']->order_no != 0)
 	{
 		delete_po($_SESSION['PO']->order_no);
-	}	
+	} else {
+		unset($_SESSION['PO']);
+		meta_forward($path_to_root.'/index.php','application=AP');
+	}
 
 	$_SESSION['PO']->clear_items();
 	$_SESSION['PO'] = new purch_order;
 
-	display_note(_("This purchase order has been cancelled."), 0, 1);
+	display_notification(_("This purchase order has been cancelled."));
 
 	hyperlink_params($path_to_root . "/purchasing/po_entry_items.php", _("Enter a new purchase order"), "NewOrder=Yes");
 	echo "<br>";
@@ -136,39 +153,27 @@ function handle_cancel_po()
 	exit;
 }
 
-//---------------------------------------------------------------------------------------------------
-if (isset($_GET['Delete']) || isset($_GET['Edit']))
-{
-	copy_from_po();
-}
-	
-if (isset($_GET['Delete']))
-{
-	handle_delete_item();
-}
-
 //---------------------------------------------------------------------------------------------------
 
 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;	
@@ -181,17 +186,19 @@ 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();
+    line_start_focus();
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -204,15 +211,15 @@ function handle_add_new_item()
 	{ 
 		if (count($_SESSION['PO']->line_items) > 0)
 		{
-		    foreach ($_SESSION['PO']->line_items AS $order_item) 
+		    foreach ($_SESSION['PO']->line_items as $order_item) 
 		    {
 
     			/* do a loop round the items on the order to see that the item
     			is not already on this order */
    			    if (($order_item->stock_id == $_POST['stock_id']) && 
-   			    	($order_item->Deleted==False)) 
+   			    	($order_item->Deleted == false)) 
    			    {
-				  	$allow_update = False;
+				  	$allow_update = false;
 				  	display_error(_("The selected item is already on this order."));
 			    }
 		    } /* end of the foreach loop to look for pre-existing items of the same code */
@@ -221,24 +228,24 @@ function handle_add_new_item()
 		if ($allow_update == true)
 		{
 		   	$sql = "SELECT description, units, mb_flag
-				FROM ".TB_PREF."stock_master WHERE stock_id = '". $_POST['stock_id'] . "'";
+				FROM ".TB_PREF."stock_master WHERE stock_id = ".db_escape($_POST['stock_id']);
 
 		    $result = db_query($sql,"The stock details for " . $_POST['stock_id'] . " could not be retrieved");
 
 		    if (db_num_rows($result) == 0)
 		    {
-				$allow_update = False;
+				$allow_update = false;
 		    }		    
 
 			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();
-				$_POST['StockID2'] = $_POST['stock_id']	= "";
+				$_POST['stock_id']	= "";
 	   		} 
 	   		else 
 	   		{
@@ -247,42 +254,50 @@ function handle_add_new_item()
 
 		} /* end of if not already on the order and allow input was true*/
     }
+	line_start_focus();
 }
 
 //---------------------------------------------------------------------------------------------------
 
 function can_commit()
 {
+	global $Refs;
+
 	if (!is_date($_POST['OrderDate'])) 
 	{
 		display_error(_("The entered order date is invalid."));
+		set_focus('OrderDate');
 		return false;
 	} 
 	
 	if (!$_SESSION['PO']->order_no) 
 	{
-    	if (!references::is_valid($_SESSION['PO']->reference)) 
+    	if (!$Refs->is_valid(get_post('ref'))) 
     	{
     		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())) 
+    	if (!is_new_reference(get_post('ref'), ST_PURCHORDER)) 
     	{
     		display_error(_("The entered reference is already in use."));
+			set_focus('ref');
     		return false;
     	}
 	}
 	
-	if ($_SESSION['PO']->delivery_address == "")
+	if (get_post('delivery_address') == '')
 	{
 		display_error(_("There is no delivery address specified."));
+		set_focus('delivery_address');
 		return false;
 	} 
 	
-	if (!isset($_SESSION['PO']->Location) || $_SESSION['PO']->Location == "")
+	if (get_post('StkLocation') == '')
 	{
 		display_error(_("There is no location specified to move any items into."));
+		set_focus('StkLocation');
 		return false;
 	} 
 	
@@ -299,17 +314,17 @@ function can_commit()
 
 function handle_commit_order()
 {
-	copy_to_po();
 
 	if (can_commit())
 	{
+		copy_to_cart();
 
 		if ($_SESSION['PO']->order_no == 0)
 		{ 
 			
 			/*its a new order to be inserted */
 			$order_no = add_po($_SESSION['PO']);
-			 
+			new_doc_date($_SESSION['PO']->orig_order_date); 
 			unset($_SESSION['PO']);
 			 
         	meta_forward($_SERVER['PHP_SELF'], "AddedID=$order_no");	
@@ -327,46 +342,26 @@ function handle_commit_order()
 		}
 	}	
 }
-
 //---------------------------------------------------------------------------------------------------
+$id = find_submit('Delete');
+if ($id != -1)
+	handle_delete_item($id);
 
 if (isset($_POST['Commit']))
 {
 	handle_commit_order();
 }
-
-//--------------------------------------------------------------------------------------------------- 
-
 if (isset($_POST['UpdateLine']))
-{
-	copy_to_po();
 	handle_update_item();
-}
 
-//---------------------------------------------------------------------------------------------------
-
-If (isset($_POST['EnterLine']))
-{
-	copy_to_po();
+if (isset($_POST['EnterLine']))
 	handle_add_new_item();
-} 
-
-//---------------------------------------------------------------------------------------------------
 
 if (isset($_POST['CancelOrder'])) 
-{
 	handle_cancel_po();
-}
-
-//---------------------------------------------------------------------------------------------------
 
 if (isset($_POST['CancelUpdate']))
-{
-	copy_to_po();
 	unset_form_variables();
-}
-
-//---------------------------------------------------------------------------------------------------
 
 if (isset($_GET['ModifyOrderNumber']) && $_GET['ModifyOrderNumber'] != "")
 {
@@ -376,30 +371,20 @@ if (isset($_GET['ModifyOrderNumber']) && $_GET['ModifyOrderNumber'] != "")
 
 	/*read in all the selected order into the Items cart  */
 	read_po($_SESSION['PO']->order_no, $_SESSION['PO']);
-	copy_from_po();
+	
+	copy_from_cart();
 }
 
-//--------------------------------------------------------------------------------
+if (isset($_POST['CancelUpdate']) || isset($_POST['UpdateLine'])) {
+	line_start_focus();
+}
 
 if (isset($_GET['NewOrder']))
-{
 	create_new_po();
-} 
-else 
-{
-	if (!isset($_POST['supplier_id']))
-		$_POST['supplier_id'] = $_SESSION['PO']->supplier_id;
-	if (!isset($_POST['OrderDate']))		
-		$_POST['OrderDate'] = $_SESSION['PO']->orig_order_date;
-	if (!isset($_POST['Requisition']))		
-		$_POST['Requisition'] = $_SESSION['PO']->requisition_no;
-	if (!isset($_POST['Comments']))		
-		$_POST['Comments'] = $_SESSION['PO']->Comments;
-}
 
 //---------------------------------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
 
 display_po_header($_SESSION['PO']);
 echo "<br>";
@@ -410,17 +395,19 @@ start_table($table_style2);
 textarea_row(_("Memo:"), 'Comments', null, 70, 4);
 
 end_table(1);
+
+div_start('controls', 'items_table');
 if ($_SESSION['PO']->order_has_items()) 
 {
 	if ($_SESSION['PO']->order_no)
-		submit_center_first('Commit', _("Update Order"));
+		submit_center_first('Commit', _("Update Order"), '', 'default');
 	else
-		submit_center_first('Commit', _("Place Order"));
+		submit_center_first('Commit', _("Place Order"), '', 'default');
 	submit_center_last('CancelOrder', _("Cancel Order")); 	
 }
 else
-	submit_center('CancelOrder', _("Cancel Order")); 	
-
+	submit_center('CancelOrder', _("Cancel Order"), true, false, 'cancel');
+div_end();
 //---------------------------------------------------------------------------------------------------
 
 end_form();