X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fdb%2Finventory_db.inc;h=5bc37a75300055bae0ff95252ed78310d9932b3f;hb=c6647ad87a20b7bb464f6714fcad904b102e1fdc;hp=3695166ba3f6e425cc5dad4928623a7ae5a18c2e;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc index 3695166b..5bc37a75 100644 --- a/includes/db/inventory_db.inc +++ b/includes/db/inventory_db.inc @@ -59,8 +59,8 @@ function get_item_edit_info($stock_id) function get_standard_cost($stock_id) { - $sql = "SELECT material_cost + labour_cost + overhead_cost AS std_cost - FROM ".TB_PREF."stock_master WHERE stock_id=".db_escape($stock_id); + $sql = "SELECT IF(s.mb_flag='D', 0, 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"); $myrow = db_fetch_row($result); @@ -81,7 +81,213 @@ function is_inventory_item($stock_id) //------------------------------------------------------------------- -Function get_stock_gl_code($stock_id) +function last_negative_stock_begin_date($stock_id, $to) +{ + $to = date2sql($to); + $sql ="SET @q = 0"; + db_query($sql); + $sql = "SET @flag = 0"; + db_query($sql); + $sql = "SELECT SUM(qty), @q:= @q + qty, IF(@q < 0 AND @flag=0, @flag:=1,@flag:=0), IF(@q < 0 AND @flag=1, tran_date,'') AS begin_date + FROM ".TB_PREF."stock_moves + WHERE stock_id=".db_escape($stock_id)." AND tran_date<='$to' + AND qty <> 0 + GROUP BY stock_id ORDER BY tran_date"; + + $result = db_query($sql, "The dstock moves could not be retrieved"); + $row = db_fetch_row($result); + return $row[3]; +} + +//------------------------------------------------------------------- +// Newly written +function last_negative_stock_trans_id($stock_id, $to) +{ + $sql = "SELECT * from ".TB_PREF."stock_moves + WHERE stock_id=".db_escape($stock_id)." + AND qty <> 0 order by trans_id asc"; + + $result = db_query($sql, "The query on stock moves failed."); + + $qty = 0; + $flag = 0; + $negative_trans_id = 1; + + while ($myrow = db_fetch($result)) + { + $qty += $myrow['qty']; + if ($qty < 0 && $flag == 0) + { + $flag = 1; + $negative_trans_id = $myrow['trans_id']; + } + if ($qty > 0) + $flag = 0; + } + + return $negative_trans_id; +} + +//------------------------------------------------------------------- + +function get_deliveries_between($stock_id, $from, $to) +{ + $from = date2sql($from); + $to = date2sql($to); + $sql = "SELECT SUM(-qty), SUM(-qty*standard_cost) FROM ".TB_PREF."stock_moves + WHERE type=".ST_CUSTDELIVERY." AND stock_id=".db_escape($stock_id)." AND + tran_date>='$from' AND tran_date<='$to' GROUP BY stock_id"; + + $result = db_query($sql, "The deliveries could not be updated"); + 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"; + $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]); + + // 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 + $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"); + $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 == "") + return; + + $row = get_deliveries_from_trans($stock_id, $from); + + 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); + $purchase_diff = 0; + $old_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_ = _("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["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); + } +} + +function get_stock_gl_code($stock_id) { /*Gets the GL Codes relevant to the item account */