X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_category_db.inc;h=3c643d523dfc2e35fb4c74dce5d8ac24742b4c08;hb=07737913eea4abbc7a8604a286852facb2134540;hp=fc474d5e88034c5d1d8e3149c0d86c30952f7fc1;hpb=78e4d3f07b6e4a09153025d91a8bbd4c31e23aff;p=fa-stable.git

diff --git a/inventory/includes/db/items_category_db.inc b/inventory/includes/db/items_category_db.inc
index fc474d5e..3c643d52 100644
--- a/inventory/includes/db/items_category_db.inc
+++ b/inventory/includes/db/items_category_db.inc
@@ -11,12 +11,12 @@
 ***********************************************************************/
 function add_item_category($description, $tax_type_id, $sales_account, 
 	$cogs_account, $inventory_account, $adjustment_account, $assembly_account, 
-	$units, $mb_flag, $dim1, $dim2, $no_sale)
+	$units, $mb_flag, $dim1, $dim2, $no_sale, $no_purchase)
 {
 	$sql = "INSERT INTO ".TB_PREF."stock_category (description, dflt_tax_type,
 			dflt_units, dflt_mb_flag, dflt_sales_act, dflt_cogs_act, 
 			dflt_inventory_act, dflt_adjustment_act, dflt_assembly_act, 
-			dflt_dim1, dflt_dim2, dflt_no_sale)
+			dflt_dim1, dflt_dim2, dflt_no_sale, dflt_no_purchase)
 		VALUES ("
 		.db_escape($description).","
 		.db_escape($tax_type_id).","
@@ -29,14 +29,15 @@ function add_item_category($description, $tax_type_id, $sales_account,
 		.db_escape($assembly_account).","
 		.db_escape($dim1).","
 		.db_escape($dim2).","
-		.db_escape($no_sale).")";
+		.db_escape($no_sale).","
+		.db_escape($no_purchase).")";
 
 	db_query($sql,"an item category could not be added");
 }
 
 function update_item_category($id, $description, $tax_type_id, 
 	$sales_account, $cogs_account, $inventory_account, $adjustment_account, 
-	$assembly_account, $units, $mb_flag, $dim1, $dim2, $no_sale)
+	$assembly_account, $units, $mb_flag, $dim1, $dim2, $no_sale, $no_purchase)
 
 {
 	$sql = "UPDATE ".TB_PREF."stock_category SET "
@@ -51,7 +52,8 @@ function update_item_category($id, $description, $tax_type_id,
 		."dflt_assembly_act = ".db_escape($assembly_account).","
 		."dflt_dim1 = ".db_escape($dim1).","
 		."dflt_dim2 = ".db_escape($dim2).","
-		."dflt_no_sale = ".db_escape($no_sale)
+		."dflt_no_sale = ".db_escape($no_sale).","
+		."dflt_no_purchase = ".db_escape($no_purchase)
         ."WHERE category_id = ".db_escape($id);
 
 	db_query($sql,"an item category could not be updated");
@@ -64,12 +66,17 @@ function delete_item_category($id)
 	db_query($sql,"an item category could not be deleted");
 }
 
-function get_item_categories($show_inactive)
+function get_item_categories($show_inactive, $fixed_asset=false)
 {
 	$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 (!$show_inactive)
 		$sql .= " AND !c.inactive";
+	if ($fixed_asset)
+		$sql .= " AND c.dflt_mb_flag='F'";
+	else
+		$sql .= " AND c.dflt_mb_flag!='F'";
+
 	$sql .= " ORDER by description";
 
 	return db_query($sql, "could not get stock categories");
@@ -94,4 +101,3 @@ function get_category_name($id)
 	return $row[0];
 }
 
-?>
\ No newline at end of file