Removed obsolete stock_moves.visible field; changed add_stock_move() prototype.

[fa-stable.git] / includes / db / inventory_db.inc

diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc
index 225499d4bfc3d0371590abffc4ad136b35278ce5..117e318d96d53b590c263407706206527da045ee 100644 (file)
--- a/includes/db/inventory_db.inc
+++ b/includes/db/inventory_db.inc
@@ -14,11 +14,13 @@ function get_qoh_on_date($stock_id, $location=null, $date_=null)
     if ($date_ == null)
         $date_ = Today();
 
-    $date = date2sql($date_);
-
-    $sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves
-            WHERE stock_id=".db_escape($stock_id)."
-            AND tran_date <= '$date'"; 
+     $date = date2sql($date_);
+     $sql = "SELECT SUM(qty)
+       FROM ".TB_PREF."stock_moves st
+               LEFT JOIN ".TB_PREF."voided v ON st.type=v.type AND st.trans_no=v.id
+          WHERE ISNULL(v.id)
+          AND stock_id=".db_escape($stock_id)."
+          AND tran_date <= '$date'"; 
 
     if ($location != null)
         $sql .= " AND loc_code = ".db_escape($location);
@@ -242,6 +244,8 @@ function get_purchases_from_trans($stock_id, $from)
 
 function adjust_deliveries($stock_id, $material_cost, $to)
 {
+       global $Refs;
+
        if (!is_inventory_item($stock_id))
                return;
        
@@ -259,7 +263,7 @@ function adjust_deliveries($stock_id, $material_cost, $to)
        
        $row = get_purchases_from_trans($stock_id, $from);
        $purchase_diff = 0;
-       $old_purchase_cost = 0;
+       $old_purchase_cost = $new_purchase_cost = 0;
        if ($row != false)
        {
                $old_purchase_cost = $row[1];
@@ -268,28 +272,28 @@ function adjust_deliveries($stock_id, $material_cost, $to)
        }
 
        $diff =  $sales_diff - $purchase_diff;
-       
+
        if ($diff != 0)
        {
-               $update_no = get_next_trans_no(ST_COSTUPDATE);
-               if (!is_date_in_fiscalyear($to))
-                       $to = end_fiscalyear();
-          
                $stock_gl_code = get_stock_gl_code($stock_id);
 
                $dec = user_price_dec();
                $old_cost = -round2($old_sales_cost-$old_purchase_cost,$dec);
                $new_cost = -round2($new_sales_cost-$new_purchase_cost,$dec);
 
-               $memo_ = sprintf(_("Cost was %s changed to %s x quantity on hand for item '%s'"),
-                       number_format2($old_cost, 2), number_format2($new_cost, 2), $stock_id);
-               add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $to, $stock_gl_code["cogs_account"], 
-                       $stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], $memo_, $diff);           
+               $cart = new items_cart(ST_COSTUPDATE);
+               $cart->tran_date = $cart->doc_date = $cart->event_date = $to;
+               if (!is_date_in_fiscalyear($cart->tran_date))
+                       $cart->tran_date = end_fiscalyear();
+               $cart->reference = $Refs->get_next(ST_COSTUPDATE, null, $cart->tran_date, $to);
+
+               $cart->memo_ = _("Cost was ") . $old_cost. _(" changed to ") . $new_cost . _(" for item ")."'$stock_id'";
+
+               $cart->add_gl_item($stock_gl_code["cogs_account"], $stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], $diff);
+               $cart->add_gl_item($stock_gl_code["inventory_account"], 0, 0, -$diff);
 
-               add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $to, $stock_gl_code["inventory_account"], 0, 0, $memo_, 
-                       -$diff);
-               add_audit_trail(ST_COSTUPDATE, $update_no, $to);
-       }
+               write_journal_entries($cart);
+       }
 }
 
 function get_stock_gl_code($stock_id)
@@ -321,6 +325,10 @@ function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_)
 
                if ($diff != 0)
                {
+                       begin_transaction();
+                       add_journal(ST_JOURNAL, $id, $diff, $date_, get_company_currency(), $ref);
+                       $Refs->save(ST_JOURNAL, $id, $ref);
+
                        $stock_gl_code = get_stock_gl_code($stock_id);
                        $memo = _("Zero/negative inventory handling");
                        //Reverse the inventory effect if $qoh <=0
@@ -337,6 +345,7 @@ function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_)
                        add_audit_trail(ST_JOURNAL, $id, $date_);
                        add_comments(ST_JOURNAL, $id, $date_, $memo);
                        $Refs->save(ST_JOURNAL, $id, $ref);     
+                       commit_transaction();
                }
        }
 }
@@ -345,23 +354,21 @@ function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_)
 
 // $date_ - display / non-sql date
 // $std_cost - in HOME currency
-// $show_or_hide - wil this move be visible in reports, etc
 // $price - in $person_id's currency
 
 function add_stock_move($type, $stock_id, $trans_no, $location,
-    $date_, $reference, $quantity, $std_cost, $person_id=0, $show_or_hide=1,
+    $date_, $reference, $quantity, $std_cost, $person_id=0,
     $price=0, $discount_percent=0, $error_msg="")
 {
        $date = date2sql($date_);
 
        $sql = "INSERT INTO ".TB_PREF."stock_moves (stock_id, trans_no, type, loc_code,
-               tran_date, person_id, reference, qty, standard_cost, visible, price,
+               tran_date, person_id, reference, qty, standard_cost, price,
                discount_percent) VALUES (".db_escape($stock_id)
                .", ".db_escape($trans_no).", ".db_escape($type)
                .",     ".db_escape($location).", '$date', "
                .db_escape($person_id).", ".db_escape($reference).", "
                .db_escape($quantity).", ".db_escape($std_cost).","
-               .db_escape($show_or_hide).", "
                .db_escape($price).", ".db_escape($discount_percent).")";
 
        if ($error_msg == "")
@@ -383,7 +390,7 @@ function update_stock_move($type, $trans_no, $stock_id, $cost)
 
 //--------------------------------------------------------------------------------------------------
 
-function get_stock_moves($type, $type_no, $visible=false)
+function get_stock_moves($type, $type_no)
 {
        $sql = "SELECT ".TB_PREF."stock_moves.*, ".TB_PREF."stock_master.description, "
                .TB_PREF."stock_master.units,".TB_PREF."locations.location_name,"
@@ -394,8 +401,6 @@ function get_stock_moves($type, $type_no, $visible=false)
                WHERE ".TB_PREF."stock_moves.stock_id = ".TB_PREF."stock_master.stock_id
                AND ".TB_PREF."locations.loc_code=".TB_PREF."stock_moves.loc_code
                AND type=".db_escape($type)." AND trans_no=".db_escape($type_no)." ORDER BY trans_id";
-       if ($visible)
-               $sql .= " AND ".TB_PREF."stock_moves.visible=1";
 
        return db_query($sql, "Could not get stock moves");
 }