Reverted latest changes in inventory adjustment to ensure database consistency.

diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc
index 364fd0d85712a17f78fa0011e2f2022450c289c1..605206cbd97bf9569617575f839f3b5132cd1deb 100644 (file)
--- a/inventory/includes/db/items_adjust_db.inc
+++ b/inventory/includes/db/items_adjust_db.inc
@@ -83,45 +83,50 @@ function get_stock_adjustment_items($trans_no)
 //--------------------------------------------------------------------------------------------------
 
 function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $reference,
-    $quantity, $standard_cost, $memo_)
+       $quantity, $standard_cost, $memo_)
 {
-    $mb_flag = get_mb_flag($stock_id);
+       $mb_flag = get_mb_flag($stock_id);
+
     if (is_service($mb_flag))
     {
-        display_db_error("Cannot do inventory adjustment for Service item : $stock_id", "");
+       display_db_error("Cannot do inventory adjustment for Service item : $stock_id", "");
     }
-    
-       $new_cost = update_average_material_cost(null, $stock_id, $standard_cost, $quantity, $date_);
-    
+
+       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");
-    }
+               $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");
+       }
+
+       add_stock_move(ST_INVADJUST, $stock_id, $adj_id, $location,
+        $date_, $reference, $quantity, $standard_cost);
 
-    add_stock_move(ST_INVADJUST, $stock_id, $adj_id, $location,
-        $date_, $reference, $quantity, $new_cost, $standard_cost);
-    
        $inv_value = $standard_cost * $quantity;
-    $adj_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']) + $standard_cost) * $quantity;
-    }
-    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);
-    }
-    
+               // 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;
+       }
+
+       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)) {
-        // 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)));
-    }
+               // 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)));
+       }
 }

diff --git a/reporting/rep301.php b/reporting/rep301.php
index e40b412818f6eedc6257c189ae72c0727fb80a65..16e96191c34b243031e0e23681ec24ea53b1e54a 100644 (file)
--- a/reporting/rep301.php
+++ b/reporting/rep301.php
@@ -30,7 +30,7 @@ print_inventory_valuation_report();
 
 function get_domestic_price($myrow, $stock_id)
 {
-    if ($myrow['type'] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT || $myrow['type'] == ST_INVADJUST)
+    if ($myrow['type'] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT)
      {
         $price = $myrow['price'];
         if ($myrow['person_id'] > 0)

diff --git a/reporting/rep308.php b/reporting/rep308.php
index a738e3d1c8fee9044cade109ba4b74fe61dca907..0981c2ad64276153b9e67943192ad18a9e34547a 100644 (file)
--- a/reporting/rep308.php
+++ b/reporting/rep308.php
@@ -32,7 +32,7 @@ inventory_movements();
 
 function get_domestic_price($myrow, $stock_id)
 {
-    if ($myrow['type'] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT || $myrow['type'] == ST_INVADJUST)
+    if ($myrow['type'] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT)
      {
         $price = $myrow['price'];
         if ($myrow['person_id'] > 0)