X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Finquiry%2Fstock_movements.php;h=e8f6a25778af0558c6660fc9003374e7f62e0b0f;hb=cc9972b02f2bf4ece12da3431266e85e96872fb1;hp=e8591e8f57503ce57463b663a6b2cb3d966f0d27;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git
diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index e8591e8f..e8f6a257 100644
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -1,8 +1,16 @@
.
+***********************************************************************/
+$page_security = 'SA_ITEMSTRANSVIEW';
+$path_to_root = "../..";
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/includes/date_functions.inc");
@@ -16,7 +24,7 @@ if ($use_popup_windows)
if ($use_date_picker)
$js .= get_js_date_picker();
-page(_("Inventory Item Movement"), false, false, "", $js);
+page(_($help_context = "Inventory Item Movement"), false, false, "", $js);
//------------------------------------------------------------------------------------------------
check_db_has_stock_items(_("There are no items defined in the system."));
@@ -31,7 +39,7 @@ if (isset($_GET['stock_id']))
$_POST['stock_id'] = $_GET['stock_id'];
}
-start_form(false, true);
+start_form();
if (!isset($_POST['stock_id']))
$_POST['stock_id'] = get_global_stock_item();
@@ -45,7 +53,7 @@ locations_list_cells(_("From Location:"), 'StockLocation', null);
date_cells(_("From:"), 'AfterDate', '', null, -30);
date_cells(_("To:"), 'BeforeDate');
-submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), true);
+submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), 'default');
end_table();
end_form();
@@ -54,36 +62,26 @@ set_global_stock_item($_POST['stock_id']);
$before_date = date2sql($_POST['BeforeDate']);
$after_date = date2sql($_POST['AfterDate']);
-$sql = "SELECT type, trans_no, tran_date, person_id, qty, reference
- FROM ".TB_PREF."stock_moves
- WHERE loc_code='" . $_POST['StockLocation'] . "'
- AND tran_date >= '". $after_date . "'
- AND tran_date <= '" . $before_date . "'
- AND stock_id = '" . $_POST['stock_id'] . "' ORDER BY tran_date,trans_id";
-$result = db_query($sql, "could not query stock moves");
-
-check_db_error("The stock movements for the selected criteria could not be retrieved",$sql);
+$result = get_stock_movements($_POST['stock_id'], $_POST['StockLocation'],
+ $_POST['BeforeDate'], $_POST['AfterDate']);
div_start('doc_tbl');
-start_table("$table_style width=70%");
+start_table($table_style);
$th = array(_("Type"), _("#"), _("Reference"), _("Date"), _("Detail"),
_("Quantity In"), _("Quantity Out"), _("Quantity On Hand"));
table_header($th);
-$sql = "SELECT SUM(qty) FROM ".TB_PREF."stock_moves WHERE stock_id='" . $_POST['stock_id'] . "'
- AND loc_code='" . $_POST['StockLocation'] . "'
- AND tran_date < '" . $after_date . "'";
-$before_qty = db_query($sql, "The starting quantity on hand could not be calculated");
-
-$before_qty_row = db_fetch_row($before_qty);
-$after_qty = $before_qty = $before_qty_row[0];
+$before_qty = get_stock_movements_before($_POST['stock_id'], $_POST['StockLocation'], $_POST['AfterDate']);
+
+$after_qty = $before_qty;
+/*
if (!isset($before_qty_row[0]))
{
$after_qty = $before_qty = 0;
}
-
+*/
start_row("class='inquirybg'");
label_cell(""._("Quantity on hand before") . " " . $_POST['AfterDate']."", "align=center colspan=5");
label_cell(" ", "colspan=2");
@@ -104,7 +102,7 @@ while ($myrow = db_fetch($result))
$trandate = sql2date($myrow["tran_date"]);
- $type_name = systypes::name($myrow["type"]);
+ $type_name = $systypes_array[$myrow["type"]];
if ($myrow["qty"] > 0)
{
@@ -128,7 +126,7 @@ while ($myrow = db_fetch($result))
$person = $myrow["person_id"];
$gl_posting = "";
- if (($myrow["type"] == 13) || ($myrow["type"] == 11))
+ if (($myrow["type"] == ST_CUSTDELIVERY) || ($myrow["type"] == ST_CUSTCREDIT))
{
$cust_row = get_customer_details_from_trans($myrow["type"], $myrow["trans_no"]);
@@ -136,25 +134,22 @@ while ($myrow = db_fetch($result))
$person = $cust_row['name'] . " (" . $cust_row['br_name'] . ")";
}
- elseif ($myrow["type"] == 25 || $myrow['type'] == 21)
+ elseif ($myrow["type"] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT)
{
// get the supplier name
- $sql = "SELECT supp_name FROM ".TB_PREF."suppliers WHERE supplier_id = '" . $myrow["person_id"] . "'";
- $supp_result = db_query($sql,"check failed");
-
- $supp_row = db_fetch($supp_result);
+ $supp_name = get_supplier_name($myrow["person_id"]);
- if (strlen($supp_row['supp_name']) > 0)
- $person = $supp_row['supp_name'];
+ if (strlen($supp_name) > 0)
+ $person = $supp_name;
}
- elseif ($myrow["type"] == systypes::location_transfer() || $myrow["type"] == systypes::inventory_adjustment())
+ elseif ($myrow["type"] == ST_LOCTRANSFER || $myrow["type"] == ST_INVADJUST)
{
// get the adjustment type
$movement_type = get_movement_type($myrow["person_id"]);
$person = $movement_type["name"];
}
- elseif ($myrow["type"]==systypes::work_order() || $myrow["type"] == 28 ||
- $myrow["type"] == 29)
+ elseif ($myrow["type"]==ST_WORKORDER || $myrow["type"] == ST_MANUISSUE ||
+ $myrow["type"] == ST_MANURECEIVE)
{
$person = "";
}
@@ -175,16 +170,12 @@ while ($myrow = db_fetch($result))
}
//end of while loop
-// 2008-06-14. Always write this.
-//if ($total_in != 0 || $total_out != 0)
-//{
- start_row("class='inquirybg'");
- label_cell(""._("Quantity on hand after") . " " . $_POST['BeforeDate']."", "align=center colspan=5");
- qty_cell($total_in, false, $dec);
- qty_cell($total_out, false, $dec);
- qty_cell($after_qty, false, $dec);
- end_row();
-//}
+start_row("class='inquirybg'");
+label_cell(""._("Quantity on hand after") . " " . $_POST['BeforeDate']."", "align=center colspan=5");
+qty_cell($total_in, false, $dec);
+qty_cell($total_out, false, $dec);
+qty_cell($after_qty, false, $dec);
+end_row();
end_table(1);
div_end();