X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Finventory_db.inc;h=dea42fdaebe71068800d82b8345195b70890f7bc;hb=c640dae024fb9554d476bd863a68ef82ada8822d;hp=fa465ba7b62f9560f77e9cac2b66410275c33386;hpb=5571737fd18f44ec4189b1ab593436f1a8a032e5;p=fa-stable.git diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc index fa465ba7..dea42fda 100644 --- a/includes/db/inventory_db.inc +++ b/includes/db/inventory_db.inc @@ -9,43 +9,77 @@ 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]; - } - return $myrow[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; } //-------------------------------------------------------------------------------------- @@ -140,9 +174,9 @@ function last_negative_stock_trans_id($stock_id, $to) $negative_trans_id = $myrow['trans_id']; } if ($qty >= 0) - $flag = 0; + $flag = 0; } - + if ($flag == 1) return $negative_trans_id; else @@ -180,14 +214,14 @@ function get_deliveries_from_trans($stock_id, $from) ." AND trans_id ='$from'"; $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 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"); $qoh = db_fetch_row($result); - + $qty = $row[0] - $qoh[0]; //QOH prior to -ve stock is subtracted $final_cost = $row[1] - $qoh[0]*$cost[0]; @@ -210,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; @@ -227,37 +263,37 @@ 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]; $new_purchase_cost = $row[0] * $material_cost; $purchase_diff = $new_purchase_cost - $old_purchase_cost; } - + $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); - 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->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); + + write_journal_entries($cart); + } } function get_stock_gl_code($stock_id) @@ -285,26 +321,31 @@ function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_) $id = get_next_trans_no(ST_JOURNAL); $ref = $Refs->get_next(ST_JOURNAL); - $diff = get_standard_cost($stock_id) - $standard_cost; - - if ($diff !=0) + $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 add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, $stock_gl_code["inventory_account"], $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, - -$qoh * $diff); + -$diff); //GL Posting to inventory adjustment account add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, $stock_gl_code["adjustment_account"], $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, - $qoh * $diff); - + $diff); + add_audit_trail(ST_JOURNAL, $id, $date_); add_comments(ST_JOURNAL, $id, $date_, $memo); $Refs->save(ST_JOURNAL, $id, $ref); + commit_transaction(); } } } @@ -349,16 +390,6 @@ 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) @@ -383,6 +414,7 @@ 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); + $result = db_query($sql, "Could not void stock moves"); while ($row = db_fetch($result)) { @@ -392,13 +424,13 @@ function void_stock_move($type, $type_no) // The cost has to be adjusted. // Transaction rates are stored either as price or standard_cost depending on types $types = array(ST_SUPPCREDIT, ST_SUPPRECEIVE); - if (in_array($type,$types)) - $trans_rate = $row["price"]; + if (in_array($type, $types)) + $unit_cost = $row["price"]; else - $trans_rate = $row["standard_cost"]; + $unit_cost = $row["standard_cost"]; - update_average_material_cost(0, $row["stock_id"], - $trans_rate, -$row["qty"], sql2date($row["tran_date"])); + update_average_material_cost($row["person_id"], $row["stock_id"], + $unit_cost, -$row["qty"], sql2date($row["tran_date"])); } } @@ -424,8 +456,3 @@ function get_location_name($loc_code) display_db_error("could not retreive the location name for $loc_code", $sql, true); } - -//-------------------------------------------------------------------------------------------------- - - -?> \ No newline at end of file