X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Finquiry%2Fstock_movements.php;h=6b83d04599c6ae3319921d6169e6fc581357f066;hb=ddadb47f2620ce6902ad4694ce6512568862ba05;hp=35e0f20575c0782d76dcd5685586da62fc970e2e;hpb=71ef60f5895e131182cdff8b092f6da905345dc5;p=fa-stable.git
diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index 35e0f205..6b83d045 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");
@@ -17,13 +25,21 @@ if ($use_date_picker)
$js .= get_js_date_picker();
page(_("Inventory Item Movement"), false, false, "", $js);
+//------------------------------------------------------------------------------------------------
+
+check_db_has_stock_items(_("There are no items defined in the system."));
+
+if(get_post('ShowMoves'))
+{
+ $Ajax->activate('doc_tbl');
+}
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();
@@ -34,10 +50,10 @@ stock_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id']);
locations_list_cells(_("From Location:"), 'StockLocation', null);
-date_cells(_("From:"), 'AfterDate', null, -30);
+date_cells(_("From:"), 'AfterDate', '', null, -30);
date_cells(_("To:"), 'BeforeDate');
-submit_cells('ShowMoves',_("Show Movements"));
+submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), 'default');
end_table();
end_form();
@@ -56,7 +72,8 @@ $result = db_query($sql, "could not query stock moves");
check_db_error("The stock movements for the selected criteria could not be retrieved",$sql);
-start_table("$table_style width=70%");
+div_start('doc_tbl');
+start_table($table_style);
$th = array(_("Type"), _("#"), _("Reference"), _("Date"), _("Detail"),
_("Quantity In"), _("Quantity Out"), _("Quantity On Hand"));
@@ -76,8 +93,10 @@ if (!isset($before_qty_row[0]))
}
start_row("class='inquirybg'");
-label_cell(""._("Quantity on hand before") . " " . $_POST['AfterDate']."", "align=center colspan=7");
-qty_cell($before_qty);
+label_cell(""._("Quantity on hand before") . " " . $_POST['AfterDate']."", "align=center colspan=5");
+label_cell(" ", "colspan=2");
+$dec = get_qty_dec($_POST['stock_id']);
+qty_cell($before_qty, false, $dec);
end_row();
$j = 1;
@@ -93,16 +112,16 @@ 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)
{
- $quantity_formatted = number_format2($myrow["qty"],user_qty_dec());
+ $quantity_formatted = number_format2($myrow["qty"], $dec);
$total_in += $myrow["qty"];
}
else
{
- $quantity_formatted = number_format2(-$myrow["qty"],user_qty_dec());
+ $quantity_formatted = number_format2(-$myrow["qty"], $dec);
$total_out += -$myrow["qty"];
}
$after_qty += $myrow["qty"];
@@ -112,13 +131,12 @@ while ($myrow = db_fetch($result))
label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"]));
label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"], $myrow["reference"]));
-
label_cell($trandate);
$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"]);
@@ -126,7 +144,7 @@ while ($myrow = db_fetch($result))
$person = $cust_row['name'] . " (" . $cust_row['br_name'] . ")";
}
- elseif ($myrow["type"] == 25)
+ 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"] . "'";
@@ -137,14 +155,14 @@ while ($myrow = db_fetch($result))
if (strlen($supp_row['supp_name']) > 0)
$person = $supp_row['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 = "";
}
@@ -153,7 +171,7 @@ while ($myrow = db_fetch($result))
label_cell((($myrow["qty"] >= 0) ? $quantity_formatted : ""), "nowrap align=right");
label_cell((($myrow["qty"] < 0) ? $quantity_formatted : ""), "nowrap align=right");
- label_cell(number_format2($after_qty,user_qty_dec()), "nowrap align=right");
+ qty_cell($after_qty, false, $dec);
end_row();
$j++;
If ($j == 12)
@@ -165,16 +183,15 @@ while ($myrow = db_fetch($result))
}
//end of while loop
-if ($total_in != 0 || $total_out != 0)
-{
- start_row("class='inquirybg'");
- label_cell(""._("Quantity on hand after") . " " . $_POST['BeforeDate']."", "align=center colspan=7");
- qty_cell($after_qty);
- 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();
end_page();
?>