X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Finquiry%2Fstock_movements.php;h=e7fb0eed31d893b157e62dd5d99ef286dc6a5140;hb=bd8f517d30d1edd3261e26e582ddd9e11c555616;hp=e8591e8f57503ce57463b663a6b2cb3d966f0d27;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git

diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index e8591e8f..e7fb0eed 100644
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -1,8 +1,16 @@
 <?php
-
-
-$page_security = 2;
-$path_to_root="../..";
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_ITEMSTRANSVIEW';
+$path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -11,12 +19,11 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 include_once($path_to_root . "/includes/ui.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
-
-page(_("Inventory Item Movement"), false, false, "", $js);
+page(_($help_context = "Inventory Item Movement"), @$_GET['popup'], false, "", $js);
 //------------------------------------------------------------------------------------------------
 
 check_db_has_stock_items(_("There are no items defined in the system."));
@@ -31,61 +38,63 @@ 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();
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
+start_row();
+if (!$page_nested)
+	stock_costable_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id']);
+end_row();
+end_table();
 
-stock_items_list_cells(_("Item:"), 'stock_id', $_POST['stock_id']);
+start_table(TABLESTYLE_NOBORDER);
+start_row();
 
-locations_list_cells(_("From Location:"), 'StockLocation', null);
+locations_list_cells(_("From Location:"), 'StockLocation', null, true);
 
-date_cells(_("From:"), 'AfterDate', '', null, -30);
+date_cells(_("From:"), 'AfterDate', '', null, -user_transaction_days());
 date_cells(_("To:"), 'BeforeDate');
 
-submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), true);
+submit_cells('ShowMoves',_("Show Movements"),'',_('Refresh Inquiry'), 'default');
+end_row();
 end_table();
-end_form();
+if (!@$_GET['popup'])
+	end_form();
 
 set_global_stock_item($_POST['stock_id']);
 
 $before_date = date2sql($_POST['BeforeDate']);
 $after_date = date2sql($_POST['AfterDate']);
+$display_location = !$_POST['StockLocation'];
 
-$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%");
-$th = array(_("Type"), _("#"), _("Reference"), _("Date"), _("Detail"),
-	_("Quantity In"), _("Quantity Out"), _("Quantity On Hand"));
+start_table(TABLESTYLE);
+$th = array(_("Type"), _("#"), _("Reference"));
+if($display_location) array_push($th, _("Location"));
+array_push($th, _("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");
+table_header($th);
 
-$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("<b>"._("Quantity on hand before") . " " . $_POST['AfterDate']."</b>", "align=center colspan=5");
+$header_span = $display_location ? 6 : 5;
+label_cell("<b>"._("Quantity on hand before") . " " . $_POST['AfterDate']."</b>", "align=center colspan=$header_span");
 label_cell("&nbsp;", "colspan=2");
 $dec = get_qty_dec($_POST['stock_id']);
 qty_cell($before_qty, false, $dec);
@@ -104,7 +113,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)
 	{
@@ -123,12 +132,15 @@ 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"]));
+	if($display_location) {
+		label_cell($myrow['loc_code']);
+	}
 	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"]);
 
@@ -136,25 +148,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_name = get_supplier_name($myrow["person_id"]);
 
-		$supp_row = db_fetch($supp_result);
-
-		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,19 +184,14 @@ 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("<b>"._("Quantity on hand after") . " " . $_POST['BeforeDate']."</b>", "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("<b>"._("Quantity on hand after") . " " . $_POST['BeforeDate']."</b>", "align=center colspan=$header_span");
+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();
 
-?>