X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_adjust_db.inc;h=0085f98360b7b702b226bccd3421fc836ef3dc86;hb=2917915beba9540193b520f1de59de9e6a33be56;hp=605206cbd97bf9569617575f839f3b5132cd1deb;hpb=d94a924a5ad03d723ef50047204c9f543acab4dd;p=fa-stable.git

diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc
index 605206cb..0085f983 100644
--- a/inventory/includes/db/items_adjust_db.inc
+++ b/inventory/includes/db/items_adjust_db.inc
@@ -33,14 +33,14 @@ function add_stock_adjustment($items, $location, $date_, $reference, $memo_)
 	foreach ($items as $line_item)
 	{
 
-		if ($SysPrefs->loc_notification() == 1 && $line_item->qty < 0)
+		if ($SysPrefs->loc_notification() == 1 && $line_item->quantity < 0)
 		{
-			$chg = $line; $chg->qty = -$chg->qty;	// calculate_reorder_level expect positive qty
-			$loc = calculate_reorder_level($location, $line_item, $st_ids, $st_names, $st_num, $st_reorder); 
+			$chg = $line_item; $chg->quantity= -$chg->quantity;	// calculate_reorder_level expect positive qty
+			$loc = calculate_reorder_level($location, $chg, $st_ids, $st_names, $st_num, $st_reorder); 
 		}
 
 		add_stock_adjustment_item($adj_id, $line_item->stock_id, $location, $date_, $reference,
-			$line_item->quantity, $line_item->standard_cost, $memo_);
+			$line_item->quantity, $line_item->unit_cost, $memo_);
 	}
 
 	add_comments(ST_INVADJUST, $adj_id, $date_, $memo_);
@@ -83,7 +83,7 @@ function get_stock_adjustment_items($trans_no)
 //--------------------------------------------------------------------------------------------------
 
 function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $reference,
-	$quantity, $standard_cost, $memo_)
+	$quantity, $unit_cost, $memo_)
 {
 	$mb_flag = get_mb_flag($stock_id);
 
@@ -92,7 +92,7 @@ function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $refer
     	display_db_error("Cannot do inventory adjustment for Service item : $stock_id", "");
     }
 
-	update_average_material_cost(null, $stock_id, $standard_cost, $quantity, $date_);
+	update_average_material_cost(null, $stock_id, $unit_cost, $quantity, $date_);
 
 	if (is_fixed_asset($mb_flag)) {
 		$sql = "UPDATE ".TB_PREF."stock_master SET inactive=1
@@ -101,19 +101,19 @@ function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $refer
 	}
 
 	add_stock_move(ST_INVADJUST, $stock_id, $adj_id, $location,
-        $date_, $reference, $quantity, $standard_cost);
+        $date_, $reference, $quantity, $unit_cost);
 
-	$inv_value = $standard_cost * $quantity;
-	$adj_value = $standard_cost * -($quantity);
+	$inv_value = $unit_cost * $quantity;
+	$adj_value = $unit_cost * -($quantity);
 
 	if (is_fixed_asset($mb_flag)) {
 		// get the initial value of the fixed assset.
 		$row = get_fixed_asset_move($stock_id, ST_SUPPRECEIVE);
 		$inv_value = $row['price'] * $quantity;
-		$adj_value = (-($row['price']) + $standard_cost) * $quantity;
+		$adj_value = (-($row['price']) + $unit_cost) * $quantity;
 	}
 
-	if ($standard_cost > 0 || is_fixed_asset($mb_flag))
+	if ($unit_cost > 0 || is_fixed_asset($mb_flag))
 	{
 
 		$stock_gl_codes = get_stock_gl_code($stock_id);
@@ -127,6 +127,6 @@ function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $refer
 	if (is_fixed_asset($mb_flag)) {
 		// Additional gl entry for fixed asset.
 		$grn_act = get_company_pref('default_loss_on_asset_disposal_act');
-		add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $grn_act, 0, 0, $memo_, ($standard_cost * -($quantity)));
+		add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $grn_act, 0, 0, $memo_, ($unit_cost * -($quantity)));
 	}
 }