X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fmanage%2Fitem_categories.php;h=9af49483d96514387d05430c41746ba07068d4f0;hb=0d191c7bff92b9a9bbc44dab48855477edb99ebf;hp=a12f56ff0da23e06975e8a06d77615c27390831e;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git

diff --git a/inventory/manage/item_categories.php b/inventory/manage/item_categories.php
index a12f56ff..9af49483 100644
--- a/inventory/manage/item_categories.php
+++ b/inventory/manage/item_categories.php
@@ -44,7 +44,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 				$_POST['cogs_account'], $_POST['inventory_account'], 
 				$_POST['adjustment_account'], $_POST['assembly_account'],
 				$_POST['units'], $_POST['mb_flag'],	$_POST['dim1'],	$_POST['dim2'],
-				check_value('no_sale'));
+				check_value('no_sale'), check_value('no_purchase'));
 			display_notification(_('Selected item category has been updated'));
     	} 
     	else 
@@ -54,7 +54,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 				$_POST['cogs_account'], $_POST['inventory_account'], 
 				$_POST['adjustment_account'], $_POST['assembly_account'], 
 				$_POST['units'], $_POST['mb_flag'],	$_POST['dim1'],	
-				$_POST['dim2'],	check_value('no_sale'));
+				$_POST['dim2'],	check_value('no_sale'), check_value('no_purchase'));
 			display_notification(_('New item category has been added'));
     	}
 		$Mode = 'RESET';
@@ -67,10 +67,7 @@ if ($Mode == 'Delete')
 {
 
 	// PREVENT DELETES IF DEPENDENT RECORDS IN 'stock_master'
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE category_id=".db_escape($selected_id);
-	$result = db_query($sql, "could not query stock master");
-	$myrow = db_fetch_row($result);
-	if ($myrow[0] > 0) 
+	if (key_in_foreign_table($selected_id, 'stock_master', 'category_id'))
 	{
 		display_error(_("Cannot delete this item category because items have been created using this item category."));
 	} 
@@ -94,14 +91,10 @@ if (list_updated('mb_flag')) {
 }
 //----------------------------------------------------------------------------------
 
-$sql = "SELECT c.*, t.name as tax_name FROM ".TB_PREF."stock_category c, "
-	.TB_PREF."item_tax_types t WHERE c.dflt_tax_type=t.id";
-if (!check_value('show_inactive')) $sql .= " AND !c.inactive";
-
-$result = db_query($sql, "could not get stock categories");
+$result = get_item_categories(check_value('show_inactive'));
 
 start_form();
-start_table("$table_style width=80%");
+start_table(TABLESTYLE, "width=80%");
 $th = array(_("Name"), _("Tax type"), _("Units"), _("Type"), _("Sales Act"),
 _("Inventory Account"), _("COGS Account"), _("Adjustment Account"),
 _("Assembly Account"), "", "");
@@ -136,7 +129,7 @@ echo '<br>';
 //----------------------------------------------------------------------------------
 
 div_start('details');
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1) 
 {
@@ -157,6 +150,7 @@ if ($selected_id != -1)
 		$_POST['dim1']  = $myrow["dflt_dim1"];
 		$_POST['dim2']  = $myrow["dflt_dim2"];
 		$_POST['no_sale']  = $myrow["dflt_no_sale"];
+		$_POST['no_purchase']  = $myrow["dflt_no_purchase"];
 	} 
 	hidden('selected_id', $selected_id);
 	hidden('category_id');
@@ -164,6 +158,7 @@ if ($selected_id != -1)
 		$_POST['long_description'] = '';
 		$_POST['description'] = '';
 		$_POST['no_sale']  = 0;
+		$_POST['no_purchase']  = 0;
 
 		$company_record = get_company_prefs();
 
@@ -196,6 +191,8 @@ stock_units_list_row(_("Units of Measure:"), 'units', null);
 
 check_row(_("Exclude from sales:"), 'no_sale');
 
+check_row(_("Exclude from purchases:"), 'no_purchase');
+
 gl_all_accounts_list_row(_("Sales Account:"), 'sales_account', $_POST['sales_account']);
 
 if (is_service($_POST['mb_flag']))
@@ -237,4 +234,3 @@ end_form();
 
 end_page();
 
-?>