X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_db.inc;h=3806518ee8a767aab350184435e9edccaab7860f;hb=fd069bba86276f15311ff6ab10b22d4a06a55513;hp=ed69376ef00d79101c95f3367ee187dd7b705823;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/inventory/includes/db/items_db.inc b/inventory/includes/db/items_db.inc
index ed69376e..3806518e 100644
--- a/inventory/includes/db/items_db.inc
+++ b/inventory/includes/db/items_db.inc
@@ -12,7 +12,9 @@
 function update_item($stock_id, $description, $long_description, $category_id, 
 	$tax_type_id, $units='', $mb_flag='', $sales_account, $inventory_account, 
 	$cogs_account, 	$adjustment_account, $assembly_account, $dimension_id, 
-	$dimension2_id, $no_sale, $editable, $no_purchase)
+	$dimension2_id, $no_sale, $editable, $no_purchase,
+	$depreciation_method = 'D', $depreciation_rate=100, $depreciation_start=null,
+	$fa_class_id=null)
 {
 	$sql = "UPDATE ".TB_PREF."stock_master SET long_description=".db_escape($long_description).",
 		description=".db_escape($description).",
@@ -27,7 +29,10 @@ function update_item($stock_id, $description, $long_description, $category_id,
 		tax_type_id=".db_escape($tax_type_id).",
 		no_sale=".db_escape($no_sale).",
 		no_purchase=".db_escape($no_purchase).",
-		editable=".db_escape($editable);
+		editable=".db_escape($editable).",
+		depreciation_method=".db_escape($depreciation_method).",
+		depreciation_rate=".db_escape($depreciation_rate).",
+		fa_class_id=".db_escape($fa_class_id);
 
 	if ($units != '')
 		$sql .= ", units=".db_escape($units);
@@ -35,6 +40,11 @@ function update_item($stock_id, $description, $long_description, $category_id,
 	if ($mb_flag != '')
 		$sql .= ", mb_flag=".db_escape($mb_flag);
 
+	if ($depreciation_start != '') {
+		$sql .= ", depreciation_start='".date2sql($depreciation_start)."'"
+			.", depreciation_date='".date2sql($depreciation_start)."'";
+	}
+
 	$sql .= " WHERE stock_id=".db_escape($stock_id);
 
 	db_query($sql, "The item could not be updated");
@@ -45,11 +55,14 @@ function update_item($stock_id, $description, $long_description, $category_id,
 function add_item($stock_id, $description, $long_description, $category_id, 
 	$tax_type_id, $units, $mb_flag,	$sales_account, $inventory_account, 
 	$cogs_account, $adjustment_account,	$assembly_account, $dimension_id, 
-	$dimension2_id, $no_sale, $editable, $no_purchase)
+	$dimension2_id, $no_sale, $editable, $no_purchase,
+	$depreciation_method='D', $depreciation_rate=100, $depreciation_start=null,
+	$fa_class_id=null)
 {
 	$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, assembly_account, dimension_id, dimension2_id, no_sale, no_purchase, editable)
+		adjustment_account, assembly_account, dimension_id, dimension2_id, no_sale, no_purchase, editable,
+		depreciation_method, depreciation_rate, 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).",
@@ -59,12 +72,15 @@ 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($editable).","
+		.db_escape($depreciation_method).",".db_escape($depreciation_rate).",'"
+		.date2sql($depreciation_start)."','".date2sql($depreciation_start)."',"
+		.db_escape($fa_class_id).")";
 
 	db_query($sql, "The item could not be added");
 
 	$sql = "INSERT INTO ".TB_PREF."loc_stock (loc_code, stock_id)
-		SELECT ".TB_PREF."locations.loc_code, ".db_escape($stock_id)
+		SELECT loc_code, ".db_escape($stock_id)
 		." FROM ".TB_PREF."locations";
 
 	db_query($sql, "The item locstock could not be added");
@@ -98,18 +114,19 @@ function delete_item($stock_id)
 
 function get_item($stock_id)
 {
-	$sql = "SELECT ".TB_PREF."stock_master.*,".TB_PREF."item_tax_types.name AS tax_type_name
-		FROM ".TB_PREF."stock_master,".TB_PREF."item_tax_types
-		WHERE ".TB_PREF."item_tax_types.id=".TB_PREF."stock_master.tax_type_id
+	$sql = "SELECT item.*, taxtype.name AS tax_type_name
+		FROM ".TB_PREF."stock_master item,"
+			.TB_PREF."item_tax_types taxtype
+		WHERE taxtype.id=item.tax_type_id
 		AND stock_id=".db_escape($stock_id);
 	$result = db_query($sql,"an item could not be retreived");
 
 	return db_fetch($result);
 }
 
-function get_items()
+function get_items($fixed_asset = 0)
 {
-	$sql = "SELECT * FROM ".TB_PREF."stock_master";
+	$sql = "SELECT * FROM ".TB_PREF."stock_master WHERE fixed_asset=".db_escape($fixed_asset);
 	return db_query($sql,"items could not be retreived");
 }