X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=includes%2Fdb%2Finventory_db.inc;h=e0ea2ef7646f00d33338e2ab29246d0561b5dcf0;hb=90b3d069d96b99671af51726e2953352738abb75;hp=fd4aff6d2490af42280fef2e4d90df67bb43ecfb;hpb=04f6bf0a6ad4dc31a0796d896e3693559e65d339;p=fa-stable.git diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc index fd4aff6d..e0ea2ef7 100644 --- a/includes/db/inventory_db.inc +++ b/includes/db/inventory_db.inc @@ -11,35 +11,41 @@ ***********************************************************************/ function get_qoh_on_date($stock_id, $location=null, $date_=null, $exclude=0) { - 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'"; - - if ($location != null) - $sql .= " AND loc_code = ".db_escape($location); - - $result = db_query($sql, "QOH calulcation 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]; + 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'"; + } + + if ($location != null) + $sql .= " AND loc_code = ".db_escape($location); + + $result = db_query($sql, "QOH calulcation 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]; } //-------------------------------------------------------------------------------------- @@ -59,7 +65,7 @@ function get_item_edit_info($stock_id) function get_standard_cost($stock_id) { - $sql = "SELECT IF(s.mb_flag='D', 0, material_cost + labour_cost + overhead_cost) AS std_cost + $sql = "SELECT (material_cost + labour_cost + overhead_cost) AS std_cost FROM ".TB_PREF."stock_master s WHERE stock_id=".db_escape($stock_id); $result = db_query($sql, "The standard cost cannot be retrieved"); @@ -100,7 +106,19 @@ function last_negative_stock_begin_date($stock_id, $to) } //------------------------------------------------------------------- -// Newly written + +function get_already_delivered($stock_id, $location, $trans_no) +{ + $sql = "SELECT ".TB_PREF."stock_moves.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)." + 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]; +} + function last_negative_stock_trans_id($stock_id, $to) { $sql = "SELECT * from ".TB_PREF."stock_moves @@ -111,7 +129,7 @@ function last_negative_stock_trans_id($stock_id, $to) $qty = 0; $flag = 0; - $negative_trans_id = 1; + $negative_trans_id = -1; while ($myrow = db_fetch($result)) { @@ -121,11 +139,14 @@ function last_negative_stock_trans_id($stock_id, $to) $flag = 1; $negative_trans_id = $myrow['trans_id']; } - if ($qty > 0) - $flag = 0; + if ($qty >= 0) + $flag = 0; } - - return $negative_trans_id; + + if ($flag == 1) + return $negative_trans_id; + else + return false; } //------------------------------------------------------------------- @@ -142,107 +163,58 @@ function get_deliveries_between($stock_id, $from, $to) return db_fetch_row($result); } -//Newly written function get_deliveries_from_trans($stock_id, $from) { // -ve qty is delivery either by ST_CUSTDELIVERY or inventory adjustment - $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"; + //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"; $result = db_query($sql, "The deliveries could not be updated"); $row = db_fetch_row($result); - display_notification('Row0 - '.$row[0].' Row1- '.$row[1]); - - //return $row; - - // Get Std cost of previsous transaction before the cut-over delivery - // This is useful to get inventory valuation - $prev_trans = $from - 1; - display_notification('From - '.$from.' Prev- '.$prev_trans); - $sql = "SELECT standard_cost FROM ".TB_PREF."stock_moves - WHERE stock_id=".db_escape($stock_id)." AND - trans_id ='$prev_trans'"; - $result = db_query($sql, "The deliveries could not be updated"); - $cost = db_fetch_row($result); - - display_notification('Last Delivery Cost - '.$cost[0]); - + $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'"; + $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); - - display_notification('QOH before last delivery - '.$qoh[0]); - - $qty = $row[0] - $qoh[0]; //Qoh is minus from delivered in -ve + + $qty = $row[0] - $qoh[0]; //QOH prior to -ve stock is subtracted $final_cost = $row[1] - $qoh[0]*$cost[0]; - display_notification('Qty - '.$qty.' cost- '.$final_cost); - return array($qty,$final_cost); } -//Newly written 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 WHERE stock_id=".db_escape($stock_id)." AND qty > 0 AND trans_id>'$from' GROUP BY stock_id"; - $result = db_query($sql, "The deliveries could not be updated"); + $result = db_query($sql, "Could not get get_purchases_from_trans"); $row = db_fetch_row($result); - display_notification('Purchase Qty - '.$row[0].' Cost- '.$row[1]); - return $row; } //------------------------------------------------------------------- -/* Original Code V0 Leave as is a while -function adjust_deliveries_v0($stock_id, $material_cost, $to) -{ - if (!is_inventory_item($stock_id)) - return; - $from = last_negative_stock_begin_date($stock_id, $to); - if ($from == false || $from == "") - return; - $from = sql2date($from); - $row = get_deliveries_between($stock_id, $from, $to); - if ($row == false) - return; - $old_cost = $row[1]; - $new_cost = $row[0] * $material_cost; - $diff = $new_cost - $old_cost; - 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); - - $memo_ = sprintf(_("Cost was %s changed to %s for item '%s'"), - $old_cost, $new_cost, $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); - 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); - } -} -*/ -//New written function 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 == "") + if ($from == false || $from == -1) return; $row = get_deliveries_from_trans($stock_id, $from); @@ -262,11 +234,9 @@ function adjust_deliveries($stock_id, $material_cost, $to) $new_purchase_cost = $row[0] * $material_cost; $purchase_diff = $new_purchase_cost - $old_purchase_cost; } - + $diff = $sales_diff - $purchase_diff; - display_notification('Sales Diff - '.$sales_diff.' Purchase Diff - '.$purchase_diff); - if ($diff != 0) { $update_no = get_next_trans_no(ST_COSTUPDATE); @@ -292,8 +262,7 @@ function adjust_deliveries($stock_id, $material_cost, $to) function get_stock_gl_code($stock_id) { /*Gets the GL Codes relevant to the item account */ - - $sql = "SELECT inventory_account, cogs_account, + $sql = "SELECT mb_flag, inventory_account, cogs_account, adjustment_account, sales_account, assembly_account, dimension_id, dimension2_id FROM ".TB_PREF."stock_master WHERE stock_id = ".db_escape($stock_id); @@ -301,6 +270,44 @@ function get_stock_gl_code($stock_id) return db_fetch($get); } +//----------------------------------------------------------------------------------------- + +function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_) +{ + //If negative adjustment result in negative or zero inventory + //then difference should be adjusted + $qoh = get_qoh_on_date($stock_id); + + if ($qoh + $quantity <= 0 && $qoh > 0) //Positive inventory turning zero/negative + { + global $Refs; + + $id = get_next_trans_no(ST_JOURNAL); + $ref = $Refs->get_next(ST_JOURNAL); + $diff = get_standard_cost($stock_id) - $standard_cost; + + if ($diff !=0) + { + $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); + //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); + + add_audit_trail(ST_JOURNAL, $id, $date_); + add_comments(ST_JOURNAL, $id, $date_, $memo); + $Refs->save(ST_JOURNAL, $id, $ref); + } + } +} + //-------------------------------------------------------------------------------------- // $date_ - display / non-sql date @@ -312,10 +319,6 @@ 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="") { - // do not add a stock move if it's a non-inventory item - if (!is_inventory_item($stock_id)) - return null; - $date = date2sql($date_); $sql = "INSERT INTO ".TB_PREF."stock_moves (stock_id, trans_no, type, loc_code, @@ -325,8 +328,8 @@ function add_stock_move($type, $stock_id, $trans_no, $location, .", ".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).")"; + .db_escape($show_or_hide).", " + .db_escape($price).", ".db_escape($discount_percent).")"; if ($error_msg == "") $error_msg = "The stock movement record cannot be inserted"; @@ -336,15 +339,22 @@ function add_stock_move($type, $stock_id, $trans_no, $location, return db_insert_id(); } -function update_stock_move_pid($type, $stock_id, $from, $to, $pid, $cost) +function update_stock_move($type, $trans_no, $stock_id, $cost) { - $from = date2sql($from); - $to = date2sql($to); - $sql = "UPDATE ".TB_PREF."stock_moves SET standard_cost=".db_escape($cost) + $sql = "UPDATE ".TB_PREF."stock_moves SET standard_cost=".db_escape($cost) ." WHERE type=".db_escape($type) - ." AND stock_id=".db_escape($stock_id) - ." AND tran_date>='$from' AND tran_date<='$to' - AND person_id = ".db_escape($pid); + ." AND trans_no=".db_escape($trans_no) + ." AND stock_id=".db_escape($stock_id); + 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"); } @@ -371,10 +381,34 @@ function get_stock_moves($type, $type_no, $visible=false) function void_stock_move($type, $type_no) { - $sql = "UPDATE ".TB_PREF."stock_moves SET qty=0, price=0, discount_percent=0, - standard_cost=0 WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no); + $sql = "SELECT stock_id, standard_cost, loc_code, tran_date, reference, person_id, visible, discount_percent, price, + sum(qty) qty FROM ".TB_PREF."stock_moves WHERE type=".db_escape($type)." AND trans_no=".db_escape($type_no)." + GROUP BY stock_id, standard_cost, loc_code, tran_date, reference, person_id, visible, discount_percent, price HAVING sum(qty) <> 0"; + + $result = db_query($sql, "Could not void stock moves"); + while ($row = db_fetch($result)) + { + //Skip cost averaging of service items + if (is_inventory_item($row["stock_id"])) + { + // 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"]; + else + $trans_rate = $row["standard_cost"]; + + update_average_material_cost(0, $row["stock_id"], + $trans_rate, -$row["qty"], sql2date($row["tran_date"])); + } - db_query($sql, "Could not void stock moves"); + //Post stock move for service items also + add_stock_move($type, $row["stock_id"], $type_no, $row["loc_code"], + sql2date($row["tran_date"]), $row["reference"], -$row["qty"] + , $row["standard_cost"], $row["person_id"], $row["visible"], + $row["price"], $row["discount_percent"]); + } } //-------------------------------------------------------------------------------------------------- @@ -394,8 +428,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