X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fpo_entry_items.php;h=6d950dbbf26ed04d54a7c89a600d869d67a4d363;hb=c2dd0246dfc1625b90f4212767fbac3706796a08;hp=13897245858c748ca00511d8c23f1137dd5796b9;hpb=6183e9450dcd7e4c747889c10903f6ff1b0add33;p=fa-stable.git

diff --git a/purchasing/po_entry_items.php b/purchasing/po_entry_items.php
index 13897245..6d950dbb 100644
--- a/purchasing/po_entry_items.php
+++ b/purchasing/po_entry_items.php
@@ -52,6 +52,13 @@ if (isset($_GET['AddedID']))
 	display_footer_exit();	
 }
 
+//--------------------------------------------------------------------------------------------------
+function line_start_focus() {
+  global 	$Ajax;
+
+  $Ajax->activate('items_table');
+  set_focus('_stock_id_edit');
+}
 //--------------------------------------------------------------------------------------------------
 
 function copy_to_po()
@@ -89,9 +96,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);
@@ -101,6 +107,7 @@ function handle_delete_item()
 	{
 		display_error(_("This item cannot be deleted because some of it has already been received."));
 	}	
+    line_start_focus();
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -135,17 +142,6 @@ 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()
@@ -191,6 +187,7 @@ function handle_update_item()
 	$_SESSION['PO']->update_order_item($_POST['line_no'], input_num('qty'), input_num('price'),
   		$_POST['req_del_date']);
 	unset_form_variables();
+    line_start_focus();
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -203,15 +200,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 */
@@ -226,7 +223,7 @@ function handle_add_new_item()
 
 		    if (db_num_rows($result) == 0)
 		    {
-				$allow_update = False;
+				$allow_update = false;
 		    }		    
 
 			if ($allow_update)
@@ -237,7 +234,7 @@ function handle_add_new_item()
 					$_POST['req_del_date'], 0, 0);
 
 				unset_form_variables();
-				$_POST['StockID2'] = $_POST['stock_id']	= "";
+				$_POST['stock_id']	= "";
 	   		} 
 	   		else 
 	   		{
@@ -246,6 +243,7 @@ function handle_add_new_item()
 
 		} /* end of if not already on the order and allow input was true*/
     }
+	line_start_focus();
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -264,14 +262,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');
+			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');
+			set_focus('ref');
     		return false;
     	}
 	}
@@ -331,47 +329,39 @@ function handle_commit_order()
 		}
 	}	
 }
-
 //---------------------------------------------------------------------------------------------------
+$id = find_submit('Delete');
+if ($id != -1)
+	handle_delete_item($id);
 
+if (isset($_POST['Delete']) || isset($_POST['Edit']))
+{
+	copy_from_po();
+}
+	
 if (isset($_POST['Commit']))
 {
 	handle_commit_order();
 }
-
-//--------------------------------------------------------------------------------------------------- 
-
 if (isset($_POST['UpdateLine']))
 {
 	copy_to_po();
 	handle_update_item();
 }
-
-//---------------------------------------------------------------------------------------------------
-
-If (isset($_POST['EnterLine']))
+if (isset($_POST['EnterLine']))
 {
 	copy_to_po();
 	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'] != "")
 {
 	create_new_po();
@@ -382,6 +372,9 @@ if (isset($_GET['ModifyOrderNumber']) && $_GET['ModifyOrderNumber'] != "")
 	read_po($_SESSION['PO']->order_no, $_SESSION['PO']);
 	copy_from_po();
 }
+if (isset($_POST['CancelUpdate']) || isset($_POST['UpdateLine'])) {
+	line_start_focus();
+}
 
 //--------------------------------------------------------------------------------
 
@@ -414,17 +407,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"), '', true);
 	else
-		submit_center_first('Commit', _("Place Order"));
+		submit_center_first('Commit', _("Place Order"), '', true);
 	submit_center_last('CancelOrder', _("Cancel Order")); 	
 }
 else
 	submit_center('CancelOrder', _("Cancel Order")); 	
-
+div_end();
 //---------------------------------------------------------------------------------------------------
 
 end_form();