X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Finventory_db.inc;h=9032e085726120b1789505453ed142f836e5faa0;hb=331673104c056da093f60cde57d731371fbdc6ee;hp=6d562cf852b89bbc641d94d6669bdd82ccccab6d;hpb=50d1a68af70dfcadbb3896798e8211881457e3fa;p=fa-stable.git

diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc
index 6d562cf8..9032e085 100644
--- a/includes/db/inventory_db.inc
+++ b/includes/db/inventory_db.inc
@@ -86,33 +86,53 @@ function check_negative_stock($stock_id, $delta_qty, $location=null, $date=null)
 
 function get_item_edit_info($stock_id)
 {
-	$sql = "SELECT material_cost + labour_cost + overhead_cost AS standard_cost, units, decimals
-		FROM ".TB_PREF."stock_master,".TB_PREF."item_units
+	$sql = "SELECT item.material_cost, item.units, unit.decimals
+		FROM ".TB_PREF."stock_master item,"
+			.TB_PREF."item_units unit
 		WHERE stock_id=".db_escape($stock_id)
-		." AND ".TB_PREF."stock_master.units=".TB_PREF."item_units.abbr";
+		." AND item.units=unit.abbr";
 	$result = db_query($sql, "The standard cost cannot be retrieved");
 
-	return db_fetch($result);
+	$row = db_fetch($result);
+	if (is_array($row) && $row['decimals'] == -1)
+		$row['decimals'] = user_qty_dec();
+	return $row;
 }
 
 //--------------------------------------------------------------------------------------
 
-function get_standard_cost($stock_id)
+function get_unit_cost($stock_id)
 {
-	$sql = "SELECT (material_cost + labour_cost + overhead_cost) AS std_cost
-		FROM ".TB_PREF."stock_master s WHERE stock_id=".db_escape($stock_id);
+	$sql = "SELECT material_cost
+		FROM ".TB_PREF."stock_master
+		WHERE stock_id=".db_escape($stock_id);
 	$result = db_query($sql, "The standard cost cannot be retrieved");
 
 	$myrow = db_fetch_row($result);
 
-	return $myrow[0];
+	return is_array($myrow) ? $myrow[0] : false;
+}
+
+//--------------------------------------------------------------------------------------
+ 
+function get_purchase_cost($stock_id)
+{
+	$sql = "SELECT purchase_cost
+		FROM ".TB_PREF."stock_master
+		WHERE stock_id=".db_escape($stock_id);
+	$result = db_query($sql, "The purchase cost cannot be retrieved");
+
+	$myrow = db_fetch_row($result);
+
+	return is_array($myrow) ? $myrow[0] : false;
 }
 
 //--------------------------------------------------------------------------------------
 
 function is_inventory_item($stock_id)
 {
-	$sql = "SELECT stock_id FROM ".TB_PREF."stock_master
+	$sql = "SELECT stock_id FROM "
+		.TB_PREF."stock_master
 		WHERE stock_id=".db_escape($stock_id)." AND mb_flag <> 'D'";
 	$result = db_query($sql, "Cannot query is inventory item or not");
 
@@ -150,11 +170,11 @@ function get_already_delivered($stock_id, $location, $trans_no)
 		AND type=".ST_CUSTDELIVERY." AND trans_no=".db_escape($trans_no);
 	$result = db_query($sql, "Could not get stock moves");
 	$row = db_fetch_row($result);
-	return $row[0];
+	return is_array($row) ? $row[0] : false;
 }
 /*
-	FIXME: $to ? 
 	Returns start move_id in latest negative status period for $stock_id
+	FIXME: $to ? 
 */
 function last_negative_stock_trans_id($stock_id, $to)
 {
@@ -314,7 +334,7 @@ function get_stock_gl_code($stock_id)
 {
 	/*Gets the GL Codes relevant to the item account  */
 	$sql = "SELECT mb_flag, inventory_account, cogs_account,
-		adjustment_account, sales_account, assembly_account, dimension_id, dimension2_id FROM
+		adjustment_account, sales_account, wip_account, dimension_id, dimension2_id FROM
 		".TB_PREF."stock_master WHERE stock_id = ".db_escape($stock_id);
 
 	$get = db_query($sql,"retreive stock gl code");
@@ -328,7 +348,7 @@ function get_purchase_value($stock_id)
 
 	$result = db_query($sql,"retreive stock purchase price");
 	$row = db_fetch_row($result);
-	return $row[0];
+	return is_array($row) ? $row[0] : false;
 }
 
 function update_purchase_value($stock_id, $price)
@@ -352,7 +372,7 @@ function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_)
 
 		$id = get_next_trans_no(ST_JOURNAL);
 		$ref = $Refs->get_next(ST_JOURNAL, null, $date_);
-		$diff = round($qoh*get_standard_cost($stock_id) + $quantity*$standard_cost, user_price_dec());
+		$diff = round($qoh*get_unit_cost($stock_id) + $quantity*$standard_cost, user_price_dec());
 
 		if ($diff != 0)
 		{
@@ -417,8 +437,7 @@ function update_stock_move($type, $trans_no, $stock_id, $cost)
 
 function get_stock_moves($type, $type_no)
 {
-	$sql = "SELECT move.*, item.description, item.mb_flag, item.units, stock.location_name,
-		item.material_cost + item.labour_cost + item.overhead_cost AS FixedStandardCost
+	$sql = "SELECT move.*, item.description, item.mb_flag, item.units, stock.location_name
 		FROM ".TB_PREF."stock_moves move,"
 			.TB_PREF."locations stock,"
 			.TB_PREF."stock_master item