Anomaly created by Cost Update in Inventory Sales Report (rep304). Updated bugfix...

[fa-stable.git] / inventory / includes / db / items_adjust_db.inc

diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc
index f3c8c9d2be303aef54915208e0223acae26c3a57..807a404a55078bfd42f04a49bc55f9ce21339914 100644 (file)
--- a/inventory/includes/db/items_adjust_db.inc
+++ b/inventory/includes/db/items_adjust_db.inc
@@ -9,28 +9,37 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-//-------------------------------------------------------------------------------------------------------------
 
-function add_stock_adjustment($items, $location, $date_, $type, $increase, $reference, $memo_)
+function add_stock_adjustment($items, $location, $date_, $reference, $memo_)
 {
-       global $Refs;
+       global $SysPrefs, $path_to_root, $Refs;
 
        begin_transaction();
        $args = func_get_args();
-       $args = (object)array_combine(array('items', 'location', 'date_', 'type', 'increase',
-               'reference', 'memo_'), $args);
+       $args = (object)array_combine(array('items', 'location', 'date_', 'reference', 'memo_'), $args);
        $args->trans_no = 0;
        hook_db_prewrite($args, ST_INVADJUST);
 
        $adj_id = get_next_trans_no(ST_INVADJUST);
 
+       if ($SysPrefs->loc_notification() == 1)
+       {
+               include_once($path_to_root . "/inventory/includes/inventory_db.inc");
+               $st_ids = array();
+               $st_names = array();
+               $st_num = array();
+               $st_reorder = array();
+       }
        foreach ($items as $line_item)
        {
 
-               if (!$increase)
-                       $line_item->quantity = -$line_item->quantity;
+               if ($SysPrefs->loc_notification() == 1 && $line_item->qty < 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); 
+               }
 
-               add_stock_adjustment_item($adj_id, $line_item->stock_id, $location, $date_, $type, $reference,
+               add_stock_adjustment_item($adj_id, $line_item->stock_id, $location, $date_, $reference,
                        $line_item->quantity, $line_item->standard_cost, $memo_);
        }
 
@@ -42,6 +51,8 @@ function add_stock_adjustment($items, $location, $date_, $type, $increase, $refe
        $args->trans_no = $adj_id;
        hook_db_postwrite($args, ST_INVADJUST);
        commit_transaction();
+       if ($SysPrefs->loc_notification() == 1 && count($st_ids) > 0)
+               send_reorder_email($loc, $st_ids, $st_names, $st_num, $st_reorder);
 
        return $adj_id;
 }
@@ -51,14 +62,6 @@ function add_stock_adjustment($items, $location, $date_, $type, $increase, $refe
 function void_stock_adjustment($type_no)
 {
        hook_db_prevoid(ST_INVADJUST, $type_no);
-
-    //Average the cost while voiding
-    $adjustment_items = get_stock_adjustment_items($type_no);
-    while ($adjustment = db_fetch($adjustment_items))
-    {
-        update_average_material_cost(0, $adjustment['stock_id'],
-            $adjustment['standard_cost'], -$adjustment['qty'], sql2date($adjustment['tran_date']));
-    }
        void_gl_trans(ST_INVADJUST, $type_no);
        void_stock_move(ST_INVADJUST, $type_no);
 }
@@ -79,33 +82,41 @@ function get_stock_adjustment_items($trans_no)
 
 //--------------------------------------------------------------------------------------------------
 
-function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $type, $reference,
-       $quantity, $standard_cost, $memo_)
+function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $reference,
+    $quantity, $price, $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", "");
+    }
+    update_average_material_cost(null, $stock_id, $price, $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)) {
+        // 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;
+    }
+    if ($price > 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_, ($price * -($quantity)));
     }
-
-       update_average_material_cost(null, $stock_id, $standard_cost, $quantity, $date_);
-
-       add_stock_move(ST_INVADJUST, $stock_id, $adj_id, $location,
-        $date_, $reference, $quantity, $standard_cost, $type);
-
-       if ($standard_cost > 0)
-       {
-
-               $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_, ($standard_cost * -($quantity)));
-
-               add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $stock_gl_codes['inventory_account'], 0, 0, $memo_, ($standard_cost * $quantity));
-       }
 }
-
-//-------------------------------------------------------------------------------------------------------------
-
-?>
\ No newline at end of file