X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Finquiry%2Fstock_movements.php;h=2c5aa0e044b6c77a139190e9850f43a56288c590;hb=c2375734616ad4b9a96339d41847c0ba33787cf9;hp=61388dd19469babef0f4aa7049254124e7414d53;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/inventory/inquiry/stock_movements.php b/inventory/inquiry/stock_movements.php
index 61388dd1..2c5aa0e0 100644
--- a/inventory/inquiry/stock_movements.php
+++ b/inventory/inquiry/stock_movements.php
@@ -18,13 +18,15 @@ include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 include_once($path_to_root . "/includes/ui.inc");
-$js = "";
-if ($use_popup_windows)
-	$js .= get_js_open_window(800, 500);
-if ($use_date_picker)
-	$js .= get_js_date_picker();
-
-page(_($help_context = "Inventory Item Movement"), false, false, "", $js);
+if (!@$_GET['popup'])
+{
+	$js = "";
+	if ($use_popup_windows)
+		$js .= get_js_open_window(800, 500);
+	if ($use_date_picker)
+		$js .= get_js_date_picker();
+	page(_($help_context = "Inventory Item Movement"), @$_GET['popup'], false, "", $js);
+}	
 //------------------------------------------------------------------------------------------------
 
 check_db_has_stock_items(_("There are no items defined in the system."));
@@ -39,14 +41,21 @@ if (isset($_GET['stock_id']))
 	$_POST['stock_id'] = $_GET['stock_id'];
 }
 
-start_form();
+if (!@$_GET['popup'])
+	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 (!@$_GET['popup'])
+	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);
 
@@ -54,44 +63,36 @@ date_cells(_("From:"), 'AfterDate', '', null, -30);
 date_cells(_("To:"), 'BeforeDate');
 
 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']);
 
-$sql = "SELECT type, trans_no, tran_date, person_id, qty, reference
-	FROM ".TB_PREF."stock_moves
-	WHERE loc_code=".db_escape($_POST['StockLocation'])."
-	AND tran_date >= '". $after_date . "'
-	AND tran_date <= '" . $before_date . "'
-	AND stock_id = ".db_escape($_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);
+start_table(TABLESTYLE);
 $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=".db_escape($_POST['stock_id']) . "
-	AND loc_code=".db_escape( $_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("<b>"._("Quantity on hand before") . " " . $_POST['AfterDate']."</b>", "align=center colspan=5");
 label_cell("&nbsp;", "colspan=2");
@@ -147,13 +148,10 @@ while ($myrow = db_fetch($result))
 	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"] == ST_LOCTRANSFER || $myrow["type"] == ST_INVADJUST)
 	{
@@ -192,6 +190,7 @@ end_row();
 
 end_table(1);
 div_end();
-end_page();
+if (!@$_GET['popup'])
+	end_page(@$_GET['popup'], false, false);
 
 ?>