$myrow[0] -= $myrow2[0];
}
- return $myrow[0];
+ $qoh = $myrow[0];
+ return $qoh ? $qoh : 0;
}
//--------------------------------------------------------------------------------------
function get_deliveries_from_trans($stock_id, $from)
{
// -ve qty is delivery either by ST_CUSTDELIVERY or inventory adjustment
- //Price for GRN and SUPPCREDIT and std_cost for other trans_types\r
- $sql = "SELECT SUM(-qty), SUM(-qty*IF(type=".ST_SUPPRECEIVE." OR type=".ST_SUPPCREDIT.", price, standard_cost))\r
- FROM ".TB_PREF."stock_moves\r
- WHERE stock_id=".db_escape($stock_id)." AND qty < 0 AND\r
+ //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);
- $sql = "SELECT IF(type=".ST_SUPPRECEIVE." OR type=".ST_SUPPCREDIT.", price, standard_cost)\r
- FROM ".TB_PREF."stock_moves\r
- WHERE stock_id=".db_escape($stock_id)\r
- ." AND trans_id ='$from'";\r
- $result = db_query($sql, "The deliveries could not be updated");\r
+ $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
$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\r
+ $qty = $row[0] - $qoh[0]; //QOH prior to -ve stock is subtracted
$final_cost = $row[1] - $qoh[0]*$cost[0];
return array($qty,$final_cost);
$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'";
+
+ $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);
}
//-----------------------------------------------------------------------------------------
-\r
+
function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_)
{
- //If negative adjustment result in negative or zero inventory \r
+ //If negative adjustment result in negative or zero inventory
//then difference should be adjusted
$qoh = get_qoh_on_date($stock_id);
$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)
{
$stock_gl_code = get_stock_gl_code($stock_id);
$memo = _("Zero/negative inventory handling");
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);
function void_stock_move($type, $type_no)
{
- \r
$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))
{
//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\r
+ // 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"]));
}
-
- //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"]);
+
}
+ $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");
}
//--------------------------------------------------------------------------------------------------
//--------------------------------------------------------------------------------------------------
-?>
\ No newline at end of file
+?>
projects / fa-stable.git / blobdiff