X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fdb%2Finventory_db.inc;h=ad9fbb7b6a1824e86b76cead0cde8d7c95a917c3;hb=f0e1edfccbf3608463c9da99b40f9c65fd298bb3;hp=2960d567b8823350d4c5f18ace5345a1543d6851;hpb=0b63d898491b6577a5a5bf90e771dca0dcbbcf1f;p=fa-stable.git diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc index 2960d567..ad9fbb7b 100644 --- a/includes/db/inventory_db.inc +++ b/includes/db/inventory_db.inc @@ -9,46 +9,79 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -function get_qoh_on_date($stock_id, $location=null, $date_=null, $exclude=0) +function get_qoh_on_date($stock_id, $location=null, $date_=null) { if ($date_ == null) - { - $sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves - WHERE stock_id=".db_escape($stock_id); $date_ = Today(); - $date = date2sql($date_); - } - else - { - $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); - $result = db_query($sql, "QOH calulcation failed"); + $result = db_query($sql, "QOH calculation failed"); $myrow = db_fetch_row($result); - if ($exclude > 0) - { - $sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves - WHERE stock_id=".db_escape($stock_id) - ." AND type=".db_escape($exclude) - ." AND tran_date = '$date'"; - - $result = db_query($sql, "QOH calulcation failed"); - $myrow2 = db_fetch_row($result); - if ($myrow2 !== false) - $myrow[0] -= $myrow2[0]; - } $qoh = $myrow[0]; return $qoh ? $qoh : 0; } +/** +* Check whether change in stock on date would not cause negative qoh in stock history. +* Returns null on success or max. available quantity with respective date otherwise. +* Running balance is checked on daily basis only, as we do not control time of transaction. +* +* $delta_qty - tested change in stock qty at $date. +* $date - check date; when set to null checks all the stock history. +**/ + +function check_negative_stock($stock_id, $delta_qty, $location=null, $date=null) +{ + + if ($delta_qty >= 0) + return null; // qty increese is always safe + + if (!isset($date)) + $date = Today(); + + $date = date2sql($date); + + // check stock status on date + $sql = "SELECT SUM(qty) qty, '$date' tran_date FROM ".TB_PREF."stock_moves + WHERE stock_id=".db_escape($stock_id)." + AND tran_date <= '$date'"; + + if ($location) + $sql .= " AND loc_code = ".db_escape($location); + + $result = db_query($sql, "QOH calculation failed"); + $qos = db_fetch_assoc($result); + + // check also all stock changes after the date to avoid negative stock in future + $sql = TB_PREF."stock_moves WHERE stock_id=".db_escape($stock_id) . " AND tran_date > '$date'"; + + if ($location) + $sql .= " AND loc_code=".db_escape($location); + + $rt = running_total_sql($sql, 'qty', 'tran_date'); + + $sql = "SELECT {$qos['qty']}+total qty, tran_date FROM ($rt) stock_status ORDER by total, tran_date"; + $history = db_query($sql, 'cannot check stock history'); + $min_qos = db_fetch($history); + + if ($min_qos && ($min_qos['qty'] < $qos['qty'])) + $qos = $min_qos; + + return -$delta_qty > $qos['qty'] ? $qos : null; +} + //-------------------------------------------------------------------------------------- function get_item_edit_info($stock_id) @@ -110,10 +143,10 @@ 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); @@ -183,7 +216,8 @@ function get_deliveries_from_trans($stock_id, $from) $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"; $result = db_query($sql, "The deliveries could not be updated"); @@ -198,7 +232,8 @@ function get_deliveries_from_trans($stock_id, $from) function get_purchases_from_trans($stock_id, $from) { // 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"; $result = db_query($sql, "Could not get get_purchases_from_trans"); @@ -211,6 +246,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; @@ -228,7 +265,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]; @@ -237,28 +274,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'"; - 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); - } + $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); + + write_journal_entries($cart); + } } function get_stock_gl_code($stock_id) @@ -272,6 +309,23 @@ function get_stock_gl_code($stock_id) 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_) @@ -285,11 +339,15 @@ 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); + $ref = $Refs->get_next(ST_JOURNAL, null, $date_); $diff = round($qoh*get_standard_cost($stock_id) + $quantity*$standard_cost, user_price_dec()); 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 @@ -306,6 +364,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(); } } } @@ -314,29 +373,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 +// $price - in transaction currency function add_stock_move($type, $stock_id, $trans_no, $location, - $date_, $reference, $quantity, $std_cost, $person_id=0, $show_or_hide=1, - $price=0, $discount_percent=0, $error_msg="") + $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, visible, 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).")"; + 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($reference).", " + .db_escape($quantity).", ".db_escape($std_cost)."," .db_escape($price).")"; - if ($error_msg == "") - $error_msg = "The stock movement record cannot be inserted"; - - db_query($sql, $error_msg); + db_query($sql, "The stock movement record cannot be inserted"); return db_insert_id(); } @@ -350,31 +401,20 @@ function update_stock_move($type, $trans_no, $stock_id, $cost) db_query($sql, "The stock movement standard_cost cannot be updated"); } -function update_stock_move_pid($type, $type_no, $stock_id, $pid, $cost) -{ - $sql = "UPDATE ".TB_PREF."stock_moves SET standard_cost=".db_escape($cost) - ." WHERE type=".db_escape($type) - ." AND trans_no=".db_escape($type_no) - ." AND stock_id=".db_escape($stock_id) - ." AND person_id = ".db_escape($pid); - db_query($sql, "The stock movement standard_cost cannot be updated"); -} - //-------------------------------------------------------------------------------------------------- -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," - .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"; - if ($visible) - $sql .= " AND ".TB_PREF."stock_moves.visible=1"; + $sql = "SELECT move.*, item.description, item.mb_flag, item.units, stock.location_name, + item.material_cost + item.labour_cost + item.overhead_cost AS FixedStandardCost + 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"); } @@ -383,7 +423,12 @@ function get_stock_moves($type, $type_no, $visible=false) 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)) @@ -399,13 +444,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"); } @@ -413,8 +458,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"); @@ -426,3 +471,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]; +} +