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'";
+ $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);
function get_already_delivered($stock_id, $location, $trans_no)
{
- $sql = "SELECT ".TB_PREF."stock_moves.qty
+ $sql = "SELECT 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)."
+ WHERE stock_id = ".db_escape($stock_id)."
+ AND 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);
$cost = db_fetch_row($result);
// Adjusting QOH valuation
- $sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves
+ $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");
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
+ $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, "Could not get get_purchases_from_trans");
function adjust_deliveries($stock_id, $material_cost, $to)
{
+ global $Refs;
+
if (!is_inventory_item($stock_id))
return;
$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];
}
$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);
+
+ $cart->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["inventory_account"], 0, 0, $memo_,
- -$diff);
- add_audit_trail(ST_COSTUPDATE, $update_no, $to);
- }
+ $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)
global $Refs;
$id = get_next_trans_no(ST_JOURNAL);
- $ref = $Refs->get_next(ST_JOURNAL);
+ $ref = $Refs->get_next(ST_JOURNAL, null, $date_);
$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_audit_trail(ST_JOURNAL, $id, $date_);
add_comments(ST_JOURNAL, $id, $date_, $memo);
$Refs->save(ST_JOURNAL, $id, $ref);
+ commit_transaction();
}
}
}
// $date_ - display / non-sql date
// $std_cost - in HOME currency
-// $show_or_hide - wil this move be visible in reports, etc
-// $price - in $person_id's currency
+// $price - in transaction currency
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="")
+ $date_, $reference, $quantity, $std_cost, $price=0)
{
$date = date2sql($date_);
$sql = "INSERT INTO ".TB_PREF."stock_moves (stock_id, trans_no, type, loc_code,
- tran_date, person_id, reference, qty, standard_cost, visible, price,
- discount_percent) VALUES (".db_escape($stock_id)
- .", ".db_escape($trans_no).", ".db_escape($type)
- .", ".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).")";
-
- if ($error_msg == "")
- $error_msg = "The stock movement record cannot be inserted";
+ tran_date, reference, qty, standard_cost, price) VALUES ("
+ .db_escape($stock_id).", ".db_escape($trans_no).", "
+ .db_escape($type).", ".db_escape($location).", '$date', "
+ .db_escape($reference).", "
+ .db_escape($quantity).", ".db_escape($std_cost)."," .db_escape($price).")";
- db_query($sql, $error_msg);
+ db_query($sql, "The stock movement record cannot be inserted");
return db_insert_id();
}
//--------------------------------------------------------------------------------------------------
-function get_stock_moves($type, $type_no, $visible=false)
+function get_stock_moves($type, $type_no)
{
- $sql = "SELECT ".TB_PREF."stock_moves.*, ".TB_PREF."stock_master.description, "
- .TB_PREF."stock_master.units,".TB_PREF."locations.location_name,"
- .TB_PREF."stock_master.material_cost + "
- .TB_PREF."stock_master.labour_cost + "
- .TB_PREF."stock_master.overhead_cost AS FixedStandardCost
- FROM ".TB_PREF."stock_moves,".TB_PREF."locations,".TB_PREF."stock_master
- WHERE ".TB_PREF."stock_moves.stock_id = ".TB_PREF."stock_master.stock_id
- AND ".TB_PREF."locations.loc_code=".TB_PREF."stock_moves.loc_code
- AND type=".db_escape($type)." AND trans_no=".db_escape($type_no)." ORDER BY trans_id";
- if ($visible)
- $sql .= " AND ".TB_PREF."stock_moves.visible=1";
+ $sql = "SELECT move.*, item.description, item.mb_flag, item.units, stock.location_name,
+ item.material_cost + item.labour_cost + item.overhead_cost AS FixedStandardCost
+ FROM ".TB_PREF."stock_moves move,"
+ .TB_PREF."locations stock,"
+ .TB_PREF."stock_master item
+ WHERE move.stock_id = item.stock_id
+ AND stock.loc_code=move.loc_code
+ AND type=".db_escape($type)
+ ." AND trans_no=".db_escape($type_no)
+ ." ORDER BY trans_id";
return db_query($sql, "Could not get stock moves");
}
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);
+ $sql = "SELECT move.*, supplier.supplier_id
+ FROM ".TB_PREF."stock_moves move
+ LEFT JOIN ".TB_PREF."supp_trans credit ON credit.trans_no=move.trans_no AND credit.type=move.type
+ LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=move.trans_no AND 25=move.type
+ LEFT JOIN ".TB_PREF."suppliers supplier ON IFNULL(grn.supplier_id, credit.supplier_id)=supplier.supplier_id
+ WHERE move.type=".db_escape($type)." AND move.trans_no=".db_escape($type_no);
$result = db_query($sql, "Could not void stock moves");
while ($row = db_fetch($result))
else
$unit_cost = $row["standard_cost"];
- update_average_material_cost($row["person_id"], $row["stock_id"],
+ update_average_material_cost($row["supplier_id"], $row["stock_id"],
$unit_cost, -$row["qty"], sql2date($row["tran_date"]));
}
-
}
- $sql = "DELETE FROM ".TB_PREF."stock_moves WHERE type=".db_escape($type)
- ." AND trans_no=".db_escape($type_no);
+ $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");
}
function get_location_name($loc_code)
{
- $sql = "SELECT location_name FROM ".TB_PREF."locations WHERE loc_code="
- .db_escape($loc_code);
+ $sql = "SELECT location_name FROM ".TB_PREF."locations
+ WHERE loc_code=".db_escape($loc_code);
$result = db_query($sql, "could not retreive the location name for $loc_code");
display_db_error("could not retreive the location name for $loc_code", $sql, true);
}
+
+function get_mb_flag($stock_id)
+{
+ $sql = "SELECT mb_flag FROM ".TB_PREF."stock_master
+ WHERE stock_id = ".db_escape($stock_id);
+ $result = db_query($sql, "retreive mb_flag from item");
+
+ if (db_num_rows($result) == 0)
+ return -1;
+
+ $myrow = db_fetch_row($result);
+ return $myrow[0];
+}
+
projects / fa-stable.git / blobdiff