$myrow[0] -= $myrow2[0];
}
- return $myrow[0];
+ $qoh = $myrow[0];
+ return $qoh ? $qoh : 0;
}
//--------------------------------------------------------------------------------------
function get_standard_cost($stock_id)
{
- //Chaitanya : Compatibility with service items
$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");
}
//-------------------------------------------------------------------
-// Newly written
function get_already_delivered($stock_id, $location, $trans_no)
{
$qty = 0;
$flag = 0;
- $negative_trans_id = 1;
+ $negative_trans_id = -1;
while ($myrow = db_fetch($result))
{
$negative_trans_id = $myrow['trans_id'];
}
if ($qty >= 0)
- $flag = 0;
+ $flag = 0;
}
-
- return $negative_trans_id;
+
+ if ($flag == 1)
+ return $negative_trans_id;
+ else
+ return false;
}
//-------------------------------------------------------------------
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
- //Chaitanya : Corrected
- /*$sql = "SELECT max( `trans_id` )
- 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");
- $trans = db_fetch_row($result);
- $prev_trans = $trans[0];*/
-
- display_notification('From - '.$from);
- $sql = "SELECT 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);
-
- 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";
- display_notification($sql);
$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);
$new_sales_cost = $row[0] * $material_cost;
$sales_diff = $new_sales_cost - $old_sales_cost;
- display_notification(_("new_sales_cost").' - '.$row[0] .' * '. $material_cost);
- display_notification(_("new_sales_cost").' - '.$new_sales_cost.' old_sales_cost- '.$old_sales_cost);
- display_notification(_("Sales Diff").' - '.$sales_diff);
-
$row = get_purchases_from_trans($stock_id, $from);
$purchase_diff = 0;
$old_purchase_cost = 0;
$new_purchase_cost = $row[0] * $material_cost;
$purchase_diff = $new_purchase_cost - $old_purchase_cost;
}
-
- display_notification(_("new_purchase_cost").' - '.$new_purchase_cost.' old_purchase_cost- '.$old_purchase_cost);
- display_notification(_("purchase_diff").' - '.$purchase_diff);
-
+
$diff = $sales_diff - $purchase_diff;
- display_notification(_("Final diff").' - '.$diff);
-
if ($diff != 0)
{
$update_no = get_next_trans_no(ST_COSTUPDATE);
$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);
function get_stock_gl_code($stock_id)
{
/*Gets the GL Codes relevant to the item account */
- //Chaitanya : Updated to also provide mb_flag
$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);
}
//-----------------------------------------------------------------------------------------
-//Chaitanya : New Function handle negative stock effect
-//Called in add_stock_move
+
function handle_negative_inventory($stock_id, $quantity, $standard_cost, $date_)
{
- //Chaitanya : If negative adjustment result in negative or zero inventory
+ //If negative adjustment result in negative or zero inventory
//then difference should be adjusted
$qoh = get_qoh_on_date($stock_id);
$date_, $reference, $quantity, $std_cost, $person_id=0, $show_or_hide=1,
$price=0, $discount_percent=0, $error_msg="")
{
- // Chaitanya : Removed following restriction considering WO issues
- // Voiding issues and productions with Service items can not get the
- // Service items compatibility
- // 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,
return db_insert_id();
}
-//Chaitanya : Added function
function update_stock_move($type, $trans_no, $stock_id, $cost)
{
$sql = "UPDATE ".TB_PREF."stock_moves SET standard_cost=".db_escape($cost)
function void_stock_move($type, $type_no)
{
- //Chaitanya : Reversing stock move rather than voiding as it is hazardous to lose stock movement trail with respect to costing
- /*$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);
-
- db_query($sql, "Could not void stock moves"); */
-
$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.
- //Chaitanya : Transaction rates are stored either as price or standard_cost depending
- //on types
- $types = array(ST_SUPPCREDIT);
- if (in_array($type,$types))
- $trans_rate = $row["price"];
+ // Transaction rates are stored either as price or standard_cost depending on types
+ $types = array(ST_SUPPCREDIT, ST_SUPPRECEIVE);
+ 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");
}
//--------------------------------------------------------------------------------------------------
display_db_error("could not retreive the location name for $loc_code", $sql, true);
}
-
-//--------------------------------------------------------------------------------------------------
-
-
-?>
\ No newline at end of file
projects / fa-stable.git / blobdiff