X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=5d91b697a93b9900764b1359b291ab94d3e09cd1;hb=9aa3fde4cf67babeae4a60264c74321a7f97e8af;hp=59973aacf0990a8192bf833adb4b45b1c2c9c37c;hpb=2ad053537e89208467a888923e6f1702aa168142;p=fa-stable.git

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index 59973aac..5d91b697 100644
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -24,7 +24,6 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
 	{
 		$ex_rate = get_exchange_rate_to_home_currency($currency, $date);
 		$price_in_home_currency = $price / $ex_rate;
-		//$price_in_home_currency = to_home_currency($price, $currency, $date);
 	}	
 	else
 		$price_in_home_currency = $price;
@@ -43,17 +42,8 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
 	if ($adj_only)
 	{
 		if ($qoh > 0)
-		/*
-		if ($qoh <= 0)
-			$material_cost = 0;
-		else
-		*/
 			$material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) /	$qoh;
 	}
-	/*
-	elseif ($qoh + $qty <= 0)
-		$material_cost = 0;
-	*/	
 	else
 	{
 		if ($qoh < 0)
@@ -61,8 +51,9 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
 			if ($qoh + $qty > 0)
 				$cost_adjust = true;
 			$qoh = 0;
-		}	
-		$material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) /	($qoh + $qty);
+		}
+		if ($qoh + $qty != 0)
+			$material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) /	($qoh + $qty);
 	}	
 	$material_cost = round2($material_cost, $dec);
 	if ($cost_adjust) // new 2010-02-10