X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitems.php;h=dbd25cd3caa60022865a28ad5991c64d7cf9307e;hb=9c6c7f431d1316b65bb996186acedcc3e8c3b582;hp=c09c1c489e4c8c902d2c1855eb169d1ac16d15d2;hpb=4d4371fb200bb27fd6b680ebd2d1aaa450a0be7e;p=fa-stable.git

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index c09c1c48..dbd25cd3 100644
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -22,7 +22,7 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
 $user_comp = user_company();
-$new_item = get_post('stock_id')==''; 
+$new_item = get_post('stock_id')=='' || get_post('cancel'); 
 //------------------------------------------------------------------------------------
 
 if (isset($_GET['stock_id']))
@@ -40,6 +40,14 @@ if (list_updated('stock_id')) {
 	$Ajax->activate('details');
 	$Ajax->activate('controls');
 }
+
+if (get_post('cancel')) {
+	$_POST['NewStockID'] = $_POST['stock_id'] = '';
+    clear_data();
+	set_focus('stock_id');
+	$Ajax->activate('_page_body');
+}
+
 if (list_updated('category_id') || list_updated('mb_flag')) {
 	$Ajax->activate('details');
 }
@@ -286,14 +294,7 @@ table_section_title(_("Item"));
 
 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*/
-
 	text_row(_("Item Code:"), 'NewStockID', null, 21, 20);
-
-	$_POST['long_description'] = '';
-	$_POST['description'] = '';
-
 } 
 else 
 { // Must be modifying an existing item
@@ -419,9 +420,11 @@ if (!isset($_POST['NewStockID']) || $new_item)
 } 
 else 
 {
-	submit_center_first('addupdate', _("Update Item"), '', 'default');
+	submit_center_first('addupdate', _("Update Item"), '', 
+	count($_SESSION['Context']) ? true : 'default');
 	submit_return('select', _("Return"), _("Select this items and return to document entry."), 'default');
-	submit_center_last('delete', _("Delete This Item"), '', true);
+	submit('delete', _("Delete This Item"), true, '', true);
+	submit_center_last('cancel', _("Cancel"), _("Cancel Edition"), 'cancel');
 }
 
 div_end();