Rerun of items_adjust_db.inc. @itronics.

diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc
index 807a404a55078bfd42f04a49bc55f9ce21339914..364fd0d85712a17f78fa0011e2f2022450c289c1 100644 (file)
--- a/inventory/includes/db/items_adjust_db.inc
+++ b/inventory/includes/db/items_adjust_db.inc
@@ -83,40 +83,45 @@ function get_stock_adjustment_items($trans_no)
 //--------------------------------------------------------------------------------------------------
 
 function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $reference,
-    $quantity, $price, $memo_)
+    $quantity, $standard_cost, $memo_)
 {
     $mb_flag = get_mb_flag($stock_id);
     if (is_service($mb_flag))
     {
         display_db_error("Cannot do inventory adjustment for Service item : $stock_id", "");
     }
-    update_average_material_cost(null, $stock_id, $price, $quantity, $date_);
-    if (is_fixed_asset($mb_flag)) {
+    
+       $new_cost = update_average_material_cost(null, $stock_id, $standard_cost, $quantity, $date_);
+    
+       if (is_fixed_asset($mb_flag)) {
         $sql = "UPDATE ".TB_PREF."stock_master SET inactive=1
             WHERE stock_id=".db_escape($stock_id);
         db_query($sql,"The inactive flag for the fixed asset could not be updated");
     }
-    $standard_cost = get_unit_cost($stock_id); //added by faisal
+
     add_stock_move(ST_INVADJUST, $stock_id, $adj_id, $location,
-        $date_, $reference, $quantity, $standard_cost, $price);
-    $inv_value = $price * $quantity;
-    $adj_value = $price * -($quantity);
-    if (is_fixed_asset($mb_flag)) {
+        $date_, $reference, $quantity, $new_cost, $standard_cost);
+    
+       $inv_value = $standard_cost * $quantity;
+    $adj_value = $standard_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']) + $price) * $quantity;
+        $adj_value = (-($row['price']) + $standard_cost) * $quantity;
     }
-    if ($price > 0 || is_fixed_asset($mb_flag))
+    if ($standard_cost > 0 || is_fixed_asset($mb_flag))
     {
         $stock_gl_codes = get_stock_gl_code($stock_id);
         add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_,
             $stock_gl_codes['adjustment_account'], $stock_gl_codes['dimension_id'], $stock_gl_codes['dimension2_id'], $memo_, $adj_value  );
         add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $stock_gl_codes['inventory_account'], 0, 0, $memo_, $inv_value);
     }
-    if (is_fixed_asset($mb_flag)) {
+    
+       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_, ($price * -($quantity)));
+        add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $grn_act, 0, 0, $memo_, ($standard_cost * -($quantity)));
     }
 }