Bug 5466: user qty decimals handled incorrectly by code that calls get_item_edit_info...
[fa-stable.git] / includes / db / inventory_db.inc
index b0807f19108ba9267c7e06e1a3eb77b35c34a9dc..4ffda2e7abe2a1ff0497b71d7b2c691ab7e63766 100644 (file)
@@ -86,21 +86,26 @@ function check_negative_stock($stock_id, $delta_qty, $location=null, $date=null)
 
 function get_item_edit_info($stock_id)
 {
-       $sql = "SELECT material_cost + labour_cost + overhead_cost AS standard_cost, units, decimals
-               FROM ".TB_PREF."stock_master,".TB_PREF."item_units
+       $sql = "SELECT item.material_cost, item.units, unit.decimals
+               FROM ".TB_PREF."stock_master item,"
+                       .TB_PREF."item_units unit
                WHERE stock_id=".db_escape($stock_id)
-               ." AND ".TB_PREF."stock_master.units=".TB_PREF."item_units.abbr";
+               ." AND item.units=unit.abbr";
        $result = db_query($sql, "The standard cost cannot be retrieved");
 
-       return db_fetch($result);
+       $row = db_fetch($result);
+       if ($row['decimals'] == -1)
+               $row['decimals'] = user_qty_dec();
+       return $row;
 }
 
 //--------------------------------------------------------------------------------------
 
-function get_standard_cost($stock_id)
+function get_unit_cost($stock_id)
 {
-       $sql = "SELECT (material_cost + labour_cost + overhead_cost) AS std_cost
-               FROM ".TB_PREF."stock_master s WHERE stock_id=".db_escape($stock_id);
+       $sql = "SELECT material_cost
+               FROM ".TB_PREF."stock_master
+               WHERE stock_id=".db_escape($stock_id);
        $result = db_query($sql, "The standard cost cannot be retrieved");
 
        $myrow = db_fetch_row($result);
@@ -108,11 +113,26 @@ function get_standard_cost($stock_id)
        return $myrow[0];
 }
 
+//--------------------------------------------------------------------------------------
+function get_purchase_cost($stock_id)
+{
+       $sql = "SELECT purchase_cost
+               FROM ".TB_PREF."stock_master
+               WHERE stock_id=".db_escape($stock_id);
+       $result = db_query($sql, "The purchase cost cannot be retrieved");
+
+       $myrow = db_fetch_row($result);
+
+       return $myrow[0];
+}
+
 //--------------------------------------------------------------------------------------
 
 function is_inventory_item($stock_id)
 {
-       $sql = "SELECT stock_id FROM ".TB_PREF."stock_master
+       $sql = "SELECT stock_id FROM "
+               .TB_PREF."stock_master
                WHERE stock_id=".db_escape($stock_id)." AND mb_flag <> 'D'";
        $result = db_query($sql, "Cannot query is inventory item or not");
 
@@ -143,16 +163,19 @@ function last_negative_stock_begin_date($stock_id, $to)
 
 function get_already_delivered($stock_id, $location, $trans_no)
 {
-       $sql = "SELECT ".TB_PREF."stock_moves.qty
+       $sql = "SELECT qty
                FROM ".TB_PREF."stock_moves
-               WHERE ".TB_PREF."stock_moves.stock_id = ".db_escape($stock_id)."
-               AND ".TB_PREF."stock_moves.loc_code = ".db_escape($location)."
+               WHERE stock_id = ".db_escape($stock_id)."
+               AND loc_code = ".db_escape($location)."
                AND type=".ST_CUSTDELIVERY." AND trans_no=".db_escape($trans_no);
        $result = db_query($sql, "Could not get stock moves");
        $row = db_fetch_row($result);
        return $row[0];
 }
-
+/*
+       Returns start move_id in latest negative status period for $stock_id
+       FIXME: $to ? 
+*/
 function last_negative_stock_trans_id($stock_id, $to)
 {
        $sql = "SELECT * from ".TB_PREF."stock_moves
@@ -197,28 +220,32 @@ function get_deliveries_between($stock_id, $from, $to)
        return db_fetch_row($result);
 }
 
-function get_deliveries_from_trans($stock_id, $from)
+/*
+       Returns quantity and total cost of $stock_id sales, entered after record with $move_id
+*/
+function get_deliveries_from_trans($stock_id, $move_id)
 {
        // -ve qty is delivery either by ST_CUSTDELIVERY or inventory adjustment
     //Price for GRN and SUPPCREDIT and std_cost for other trans_types
     $sql = "SELECT SUM(-qty), SUM(-qty*IF(type=".ST_SUPPRECEIVE." OR type=".ST_SUPPCREDIT.", price, standard_cost))
         FROM ".TB_PREF."stock_moves
         WHERE stock_id=".db_escape($stock_id)." AND qty < 0 AND
-            trans_id>='$from' GROUP BY stock_id";
+            trans_id>='$move_id' GROUP BY stock_id";
        $result = db_query($sql, "The deliveries could not be updated");
        $row = db_fetch_row($result);
        
     $sql = "SELECT IF(type=".ST_SUPPRECEIVE." OR type=".ST_SUPPCREDIT.", price, standard_cost)
         FROM ".TB_PREF."stock_moves
         WHERE stock_id=".db_escape($stock_id)
-            ." AND trans_id ='$from'";
+            ." AND trans_id ='$move_id'";
     $result = db_query($sql, "The deliveries could not be updated");
     $cost = db_fetch_row($result);
 
        // Adjusting QOH valuation 
-       $sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves
+       $sql = "SELECT SUM(qty)
+               FROM ".TB_PREF."stock_moves
                WHERE stock_id=".db_escape($stock_id)." AND
-                       trans_id<'$from' GROUP BY stock_id";
+                       trans_id<'$move_id' GROUP BY stock_id";
        $result = db_query($sql, "The deliveries could not be updated");
        $qoh = db_fetch_row($result);
 
@@ -228,12 +255,16 @@ function get_deliveries_from_trans($stock_id, $from)
        return array($qty,$final_cost); 
 }
 
-function get_purchases_from_trans($stock_id, $from)
+/*
+       Returns quantity and total cost of $stock_id purchases, entered after record with $move_id
+*/
+function get_purchases_from_trans($stock_id, $move_id)
 {
        // Calculate All inward stock moves i.e. qty > 0
-       $sql = "SELECT SUM(qty), SUM(qty*standard_cost) FROM ".TB_PREF."stock_moves
+       $sql = "SELECT SUM(qty), SUM(qty*standard_cost)
+               FROM ".TB_PREF."stock_moves
                WHERE stock_id=".db_escape($stock_id)." AND qty > 0 AND 
-                       trans_id>'$from' GROUP BY stock_id";
+                       trans_id>'$move_id' GROUP BY stock_id";
        $result = db_query($sql, "Could not get get_purchases_from_trans");
        $row = db_fetch_row($result);
        
@@ -241,7 +272,10 @@ function get_purchases_from_trans($stock_id, $from)
 }
 
 //-------------------------------------------------------------------
-
+/*
+       This routine fixes stock and COGS balances for all $stock_id sales made during negative inventory status.
+       This is called when delivery is received causing inventory status to be positive again.
+*/
 function adjust_deliveries($stock_id, $material_cost, $to)
 {
        global $Refs;
@@ -249,19 +283,19 @@ function adjust_deliveries($stock_id, $material_cost, $to)
        if (!is_inventory_item($stock_id))
                return;
        
-       $from = last_negative_stock_trans_id($stock_id, $to);
-       if ($from == false || $from == -1)
+       $move_id = last_negative_stock_trans_id($stock_id, $to);
+       if ($move_id == false || $move_id == -1)
                return;
 
-       $row = get_deliveries_from_trans($stock_id, $from);
-               
+       $row = get_deliveries_from_trans($stock_id, $move_id);
+
        if ($row == false)
                return; 
        $old_sales_cost = $row[1];
        $new_sales_cost = $row[0] * $material_cost;
        $sales_diff = $new_sales_cost - $old_sales_cost;
        
-       $row = get_purchases_from_trans($stock_id, $from);
+       $row = get_purchases_from_trans($stock_id, $move_id);
        $purchase_diff = 0;
        $old_purchase_cost = $new_purchase_cost = 0;
        if ($row != false)
@@ -300,13 +334,30 @@ function get_stock_gl_code($stock_id)
 {
        /*Gets the GL Codes relevant to the item account  */
        $sql = "SELECT mb_flag, inventory_account, cogs_account,
-               adjustment_account, sales_account, assembly_account, dimension_id, dimension2_id FROM
+               adjustment_account, sales_account, wip_account, dimension_id, dimension2_id FROM
                ".TB_PREF."stock_master WHERE stock_id = ".db_escape($stock_id);
 
        $get = db_query($sql,"retreive stock gl code");
        return db_fetch($get);
 }
 
+function get_purchase_value($stock_id)
+{
+       $sql = "SELECT purchase_cost FROM
+               ".TB_PREF."stock_master WHERE stock_id = ".db_escape($stock_id);
+
+       $result = db_query($sql,"retreive stock purchase price");
+       $row = db_fetch_row($result);
+       return $row[0];
+}
+
+function update_purchase_value($stock_id, $price)
+{
+       $price = round2($price, user_price_dec());
+       $sql = "UPDATE ".TB_PREF."stock_master SET purchase_cost=".db_escape($price)
+                       ." WHERE stock_id=".db_escape($stock_id);
+       db_query($sql, "The stock master purchase_cost cannot be updated");
+}      
 //-----------------------------------------------------------------------------------------
 
 function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_)
@@ -320,8 +371,8 @@ function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_)
                global $Refs;
 
                $id = get_next_trans_no(ST_JOURNAL);
-               $ref = $Refs->get_next(ST_JOURNAL);
-               $diff = round($qoh*get_standard_cost($stock_id) + $quantity*$standard_cost, user_price_dec());
+               $ref = $Refs->get_next(ST_JOURNAL, null, $date_);
+               $diff = round($qoh*get_unit_cost($stock_id) + $quantity*$standard_cost, user_price_dec());
 
                if ($diff != 0)
                {
@@ -354,18 +405,18 @@ function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_)
 
 // $date_ - display / non-sql date
 // $std_cost - in HOME currency
-// $price - in $person_id's currency
+// $price - in transaction currency
 
 function add_stock_move($type, $stock_id, $trans_no, $location,
-    $date_, $reference, $quantity, $std_cost, $person_id=0, $price=0)
+    $date_, $reference, $quantity, $std_cost, $price=0)
 {
        $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, price) VALUES ("
+               tran_date, reference, qty, standard_cost, price) 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($reference).", "
                .db_escape($quantity).", ".db_escape($std_cost)."," .db_escape($price).")";
 
        db_query($sql, "The stock movement record cannot be inserted");
@@ -386,15 +437,15 @@ function update_stock_move($type, $trans_no, $stock_id, $cost)
 
 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,"
-               .TB_PREF."stock_master.material_cost + "
-                       .TB_PREF."stock_master.labour_cost + "
-                       .TB_PREF."stock_master.overhead_cost AS FixedStandardCost
-               FROM ".TB_PREF."stock_moves,".TB_PREF."locations,".TB_PREF."stock_master
-               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";
+       $sql = "SELECT move.*, item.description, item.mb_flag, item.units, stock.location_name
+               FROM ".TB_PREF."stock_moves move,"
+                       .TB_PREF."locations stock,"
+                       .TB_PREF."stock_master item
+               WHERE move.stock_id = item.stock_id
+               AND stock.loc_code=move.loc_code
+               AND type=".db_escape($type)
+               ." AND trans_no=".db_escape($type_no)
+               ." ORDER BY trans_id";
 
        return db_query($sql, "Could not get stock moves");
 }
@@ -403,7 +454,12 @@ function get_stock_moves($type, $type_no)
 
 function void_stock_move($type, $type_no)
 {
-    $sql = "SELECT * from ".TB_PREF."stock_moves WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no);
+    $sql = "SELECT move.*, supplier.supplier_id
+               FROM ".TB_PREF."stock_moves move
+                               LEFT JOIN ".TB_PREF."supp_trans credit ON credit.trans_no=move.trans_no AND credit.type=move.type
+                               LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=move.trans_no AND 25=move.type
+                               LEFT JOIN ".TB_PREF."suppliers supplier ON IFNULL(grn.supplier_id, credit.supplier_id)=supplier.supplier_id
+                       WHERE move.type=".db_escape($type)." AND move.trans_no=".db_escape($type_no);
 
     $result = db_query($sql, "Could not void stock moves");
     while ($row = db_fetch($result))
@@ -419,12 +475,13 @@ function void_stock_move($type, $type_no)
                        else
                                $unit_cost = $row["standard_cost"];
 
-                       update_average_material_cost($row["person_id"], $row["stock_id"],
+                       update_average_material_cost($row["supplier_id"], $row["stock_id"],
                                $unit_cost, -$row["qty"], sql2date($row["tran_date"]));
                }
     }
-       $sql = "DELETE FROM ".TB_PREF."stock_moves WHERE type=".db_escape($type)
-               ."      AND trans_no=".db_escape($type_no);
+       $sql = "DELETE FROM ".TB_PREF."stock_moves
+                       WHERE type=".db_escape($type)
+                       ."      AND trans_no=".db_escape($type_no);
        db_query($sql, "The stock movement cannot be delated");
 }
 
@@ -432,8 +489,8 @@ function void_stock_move($type, $type_no)
 
 function get_location_name($loc_code)
 {
-       $sql = "SELECT location_name FROM ".TB_PREF."locations WHERE loc_code="
-               .db_escape($loc_code);
+       $sql = "SELECT location_name FROM ".TB_PREF."locations
+               WHERE loc_code=".db_escape($loc_code);
 
        $result = db_query($sql, "could not retreive the location name for $loc_code");
 
@@ -445,3 +502,17 @@ function get_location_name($loc_code)
 
        display_db_error("could not retreive the location name for $loc_code", $sql, true);
 }
+
+function get_mb_flag($stock_id)
+{
+       $sql = "SELECT mb_flag FROM ".TB_PREF."stock_master
+               WHERE stock_id = ".db_escape($stock_id);
+       $result = db_query($sql, "retreive mb_flag from item");
+       
+       if (db_num_rows($result) == 0)
+               return -1;
+
+       $myrow = db_fetch_row($result);
+       return $myrow[0];
+}
+