X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitems.php;h=99091defdf6dcf9ee32be7255be0a889c10422fc;hb=4d5c386a745f07e2f937c5a3fcfffdb431551cc5;hp=9ce8b6f80dd9aad891026f181609a0e991e70f98;hpb=3aebde86793f495095e09160ebaae3e7b7040747;p=fa-stable.git

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 9ce8b6f8..99091def 100644
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -18,7 +18,7 @@ $new_item = get_post('stock_id')=='';
 
 if (isset($_GET['stock_id']))
 {
-	$stock_id = strtoupper($_GET['stock_id']);
+	$_POST['stock_id'] = $stock_id = strtoupper($_GET['stock_id']);
 }
 else if (isset($_POST['stock_id']))
 {
@@ -27,9 +27,9 @@ else if (isset($_POST['stock_id']))
 
 if (list_updated('stock_id')) {
 	$_POST['NewStockID'] = get_post('stock_id');
+    clear_data();
 	$Ajax->activate('details');
 	$Ajax->activate('controls');
-//	unset($_POST['New']);
 }
 $upload_file = "";
 if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '') 
@@ -83,8 +83,6 @@ check_db_has_item_tax_types(_("There are no item tax types defined in the system
 
 function clear_data()
 {
-//	global $new_item;
-	
 	unset($_POST['long_description']);
 	unset($_POST['description']);
 	unset($_POST['category_id']);
@@ -94,7 +92,6 @@ function clear_data()
 	unset($_POST['NewStockID']);
 	unset($_POST['dimension_id']);
 	unset($_POST['dimension2_id']);
-//	$new_item = true;
 }
 
 //------------------------------------------------------------------------------------
@@ -153,7 +150,6 @@ if (isset($_POST['addupdate']))
 
 		display_notification(_("A new item has been added."));
 		$_POST['stock_id'] = $_POST['NewStockID'];
-//		$new_item = false;
 		}
 		set_focus('stock_id');
 		$Ajax->activate('_page_body');
@@ -216,14 +212,18 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1)
 		if (file_exists($filename))
 			unlink($filename);
 		display_notification(_("Selected item has been deleted."));
-//		$new_item = true;
 		$_POST['stock_id'] = '';
 		clear_data();
 		set_focus('stock_id');
 		$Ajax->activate('_page_body');
-//		meta_forward($_SERVER['PHP_SELF']);
 	}
 }
+//-------------------------------------------------------------------------------------------- 
+
+if (isset($_POST['select']))
+{
+	context_return(array('stock_id' => $_POST['stock_id']));
+}
 
 //------------------------------------------------------------------------------------
 
@@ -240,9 +240,6 @@ if (db_has_stock_items())
 	end_table();
 }
 
-//hyperlink_params($_SERVER['PHP_SELF'], _("Enter a new item"), "New=1");
-//echo "<br>";
-
 div_start('details');
 start_table("$table_style2 width=40%");
 
@@ -255,7 +252,6 @@ if ($new_item)
 
 /*If the page was called without $_POST['NewStockID'] passed to page then assume a new item is to be entered show a form with a part Code field other wise the form showing the fields with the existing entries against the part will show for editing with only a hidden stock_id field. New is set to flag that the page may have called itself and still be entering a new part, in which case the page needs to know not to go looking up details for an existing part*/
 
-    clear_data();
 	text_row(_("Item Code:"), 'NewStockID', null, 21, 20);
 
 	$company_record = get_company_prefs();
@@ -386,7 +382,7 @@ if (!isset($_POST['NewStockID']) || $new_item)
 else 
 {
 	submit_center_first('addupdate', _("Update Item"), '', true);
-
+	submit_return('select', _("Return"), _("Select this items and return to document entry."), true);
 	submit_center_last('delete', _("Delete This Item"), '', true);
 }