X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_db.inc;h=cfbbbdbe579bd0f68097906ecead76ce54957c08;hb=2917915beba9540193b520f1de59de9e6a33be56;hp=fa3d21a282efd2ae06aa37da3bb7401bfd741204;hpb=99925cb37085cf4e4f3ec09db878b3cc0c0d41a0;p=fa-stable.git

diff --git a/inventory/includes/db/items_db.inc b/inventory/includes/db/items_db.inc
index fa3d21a2..cfbbbdbe 100644
--- a/inventory/includes/db/items_db.inc
+++ b/inventory/includes/db/items_db.inc
@@ -14,7 +14,7 @@ function update_item($stock_id, $description, $long_description, $category_id,
 	$cogs_account, 	$adjustment_account, $wip_account, $dimension_id, 
 	$dimension2_id, $no_sale, $editable, $no_purchase,
 	$depreciation_method = 'D', $depreciation_rate=100, $depreciation_factor=1,
-	$depreciation_start=null, $fa_class_id=null)
+	$depreciation_start=null, $fa_class_id=null, $vat_category='')
 {
 	$sql = "UPDATE ".TB_PREF."stock_master SET long_description=".db_escape($long_description).",
 		description=".db_escape($description).",
@@ -41,7 +41,10 @@ function update_item($stock_id, $description, $long_description, $category_id,
 	if ($mb_flag != '')
 		$sql .= ", mb_flag=".db_escape($mb_flag);
 
-	if ($depreciation_start != '') {
+	if ($vat_category != '')
+		$sql .= ", vat_category=".db_escape($vat_category);
+
+	if (isset($depreciation_start)) {
 		$sql .= ", depreciation_start='".date2sql($depreciation_start)."'"
 			.", depreciation_date='".date2sql($depreciation_start)."'";
 	}
@@ -58,13 +61,14 @@ function add_item($stock_id, $description, $long_description, $category_id,
 	$cogs_account, $adjustment_account,	$wip_account, $dimension_id, 
 	$dimension2_id, $no_sale, $editable, $no_purchase,
 	$depreciation_method='D', $depreciation_rate=100,  $depreciation_factor=1, $depreciation_start=null,
-	$fa_class_id=null)
+	$fa_class_id=null, $vat_category=0)
 {
 	$sql = "INSERT INTO ".TB_PREF."stock_master (stock_id, description, long_description, category_id,
 		tax_type_id, units, mb_flag, sales_account, inventory_account, cogs_account,
-		adjustment_account, wip_account, dimension_id, dimension2_id, no_sale, no_purchase, editable,
-		depreciation_method, depreciation_rate, depreciation_factor, depreciation_start, depreciation_date, fa_class_id)
-		VALUES (".db_escape($stock_id).", ".db_escape($description).", ".db_escape($long_description).",
+		adjustment_account, wip_account, dimension_id, dimension2_id, no_sale, no_purchase, editable, vat_category,
+		depreciation_method, depreciation_rate, depreciation_factor"
+		.(isset($depreciation_start) ? ", depreciation_start, depreciation_date, fa_class_id" : "")
+		.") VALUES (".db_escape($stock_id).", ".db_escape($description).", ".db_escape($long_description).",
 		".db_escape($category_id).", ".db_escape($tax_type_id).", "
 		.db_escape($units).", ".db_escape($mb_flag).",
 		".db_escape($sales_account).", ".db_escape($inventory_account)
@@ -73,10 +77,10 @@ function add_item($stock_id, $description, $long_description, $category_id,
 		.db_escape($dimension_id).", ".db_escape($dimension2_id).","
 		.db_escape($no_sale).","
 		.db_escape($no_purchase).","
-		.db_escape($editable).","
-		.db_escape($depreciation_method).",".db_escape($depreciation_rate).",".db_escape($depreciation_factor).",'"
-		.date2sql($depreciation_start)."','".date2sql($depreciation_start)."',"
-		.db_escape($fa_class_id).")";
+		.db_escape($editable).",".db_escape($vat_category).","
+		.db_escape($depreciation_method).",".db_escape($depreciation_rate).",".db_escape($depreciation_factor)
+		.(isset($depreciation_start) ? ",'".date2sql($depreciation_start)."','".date2sql($depreciation_start)."',".db_escape($fa_class_id) : "")
+		.")";
 
 	db_query($sql, "The item could not be added");
 
@@ -122,7 +126,7 @@ function get_item($stock_id)
 		AND stock_id=".db_escape($stock_id);
 	$result = db_query($sql,"an item could not be retreived");
 
-	return db_fetch($result);
+	return db_fetch_assoc($result);
 }
 
 function get_items($fixed_asset = 0)