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

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index fdc55902..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,17 @@ 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');
+}
 $upload_file = "";
 if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '') 
 {
@@ -164,7 +175,7 @@ if (isset($_POST['addupdate']))
 				$_POST['dimension_id'], $_POST['dimension2_id']);
 
 		display_notification(_("A new item has been added."));
-		$_POST['stock_id'] = $_POST['NewStockID'];
+		$_POST['stock_id'] = $_POST['NewStockID'] = '';
 		}
 		set_focus('stock_id');
 		$Ajax->activate('_page_body');
@@ -179,7 +190,7 @@ function can_delete($stock_id)
 	$result = db_query($sql, "could not query stock moves");
 	$myrow = db_fetch_row($result);
 	if ($myrow[0] > 0) 
-	{
+{
 		display_error(_('Cannot delete this item because there are stock movements that refer to this item.'));
 		return false;
 	}
@@ -245,6 +256,7 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1)
 		$_POST['stock_id'] = '';
 		clear_data();
 		set_focus('stock_id');
+		$new_item = true;
 		$Ajax->activate('_page_body');
 	}
 }
@@ -255,6 +267,7 @@ if (isset($_POST['select']))
 	context_return(array('stock_id' => $_POST['stock_id']));
 }
 
+
 //------------------------------------------------------------------------------------
 
 start_form(true);
@@ -281,28 +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);
-
-	$company_record = get_company_prefs();
-
-    if (!isset($_POST['inventory_account']) || $_POST['inventory_account'] == "")
-    	$_POST['inventory_account'] = $company_record["default_inventory_act"];
-
-    if (!isset($_POST['cogs_account']) || $_POST['cogs_account'] == "")
-    	$_POST['cogs_account'] = $company_record["default_cogs_act"];
-
-	if (!isset($_POST['sales_account']) || $_POST['sales_account'] == "")
-		$_POST['sales_account'] = $company_record["default_inv_sales_act"];
-
-	if (!isset($_POST['adjustment_account']) || $_POST['adjustment_account'] == "")
-		$_POST['adjustment_account'] = $company_record["default_adj_act"];
-
-	if (!isset($_POST['assembly_account']) || $_POST['assembly_account'] == "")
-		$_POST['assembly_account'] = $company_record["default_assembly_act"];
-
 } 
 else 
 { // Must be modifying an existing item
@@ -334,7 +326,23 @@ text_row(_("Name:"), 'description', null, 52, 50);
 
 textarea_row(_('Description:'), 'long_description', null, 42, 3);
 
-stock_categories_list_row(_("Category:"), 'category_id', null);
+stock_categories_list_row(_("Category:"), 'category_id', null, $new_item);
+
+if ($new_item && (list_updated('category_id') || !isset($_POST['units']))) {
+
+	$category_record = get_item_category($_POST['category_id']);
+
+	$_POST['tax_type_id'] = $category_record["dflt_tax_type"];
+	$_POST['units'] = $category_record["dflt_units"];
+	$_POST['mb_flag'] = $category_record["dflt_mb_flag"];
+   	$_POST['inventory_account'] = $category_record["dflt_inventory_act"];
+   	$_POST['cogs_account'] = $category_record["dflt_cogs_act"];
+	$_POST['sales_account'] = $category_record["dflt_sales_act"];
+	$_POST['adjustment_account'] = $category_record["dflt_adjustment_act"];
+	$_POST['assembly_account'] = $category_record["dflt_assembly_act"];
+	$_POST['dimension_id'] = $category_record["dflt_dim1"];
+	$_POST['dimension2_id'] = $category_record["dflt_dim2"];
+}
 
 item_tax_types_list_row(_("Item Tax Type:"), 'tax_type_id', null);
 
@@ -408,13 +416,15 @@ div_end();
 div_start('controls');
 if (!isset($_POST['NewStockID']) || $new_item) 
 {
-	submit_center('addupdate', _("Insert New Item"), true, '', true);
+	submit_center('addupdate', _("Insert New Item"), true, '', 'default');
 } 
 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);
+	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('delete', _("Delete This Item"), true, '', true);
+	submit_center_last('cancel', _("Cancel"), _("Cancel Edition"), 'cancel');
 }
 
 div_end();