X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep303.php;h=7d8984dbfca13d4b2af6974b529c3b901985d9a5;hb=f425362379fe66e2b0f17b6e4f09d8d9bdf6c5f2;hp=e12e5f0f430bdafdaace4fd4f9255a23fbefba81;hpb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;p=fa-stable.git

diff --git a/reporting/rep303.php b/reporting/rep303.php
index e12e5f0f..7d8984db 100644
--- a/reporting/rep303.php
+++ b/reporting/rep303.php
@@ -31,38 +31,37 @@ print_stock_check();
 
 function getTransactions($category, $location, $item_like)
 {
-	$sql = "SELECT ".TB_PREF."stock_master.category_id,
-			".TB_PREF."stock_category.description AS cat_description,
-			".TB_PREF."stock_master.stock_id,
-			".TB_PREF."stock_master.units,
-			".TB_PREF."stock_master.description, ".TB_PREF."stock_master.inactive,
-			IF(".TB_PREF."stock_moves.stock_id IS NULL, '', ".TB_PREF."stock_moves.loc_code) AS loc_code,
-			SUM(IF(".TB_PREF."stock_moves.stock_id IS NULL,0,".TB_PREF."stock_moves.qty)) AS QtyOnHand
-		FROM (".TB_PREF."stock_master,
-			".TB_PREF."stock_category)
-		LEFT JOIN ".TB_PREF."stock_moves ON
-			(".TB_PREF."stock_master.stock_id=".TB_PREF."stock_moves.stock_id)
-		WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
-		AND (".TB_PREF."stock_master.mb_flag='B' OR ".TB_PREF."stock_master.mb_flag='M')";
+	$sql = "SELECT item.category_id,
+			category.description AS cat_description,
+			item.stock_id, item.units,
+			item.description, item.inactive,
+			IF(move.stock_id IS NULL, '', move.loc_code) AS loc_code,
+			SUM(IF(move.stock_id IS NULL,0,move.qty)) AS QtyOnHand
+		FROM ("
+			.TB_PREF."stock_master item,"
+			.TB_PREF."stock_category category)
+			LEFT JOIN ".TB_PREF."stock_moves move ON item.stock_id=move.stock_id
+		WHERE item.category_id=category.category_id
+		AND (item.mb_flag='B' OR item.mb_flag='M')";
 	if ($category != 0)
-		$sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category);
+		$sql .= " AND item.category_id = ".db_escape($category);
 	if ($location != 'all')
-		$sql .= " AND IF(".TB_PREF."stock_moves.stock_id IS NULL, '1=1',".TB_PREF."stock_moves.loc_code = ".db_escape($location).")";
+		$sql .= " AND IF(move.stock_id IS NULL, '1=1',move.loc_code = ".db_escape($location).")";
   if($item_like)
   {
     $regexp = null;
 
     if(sscanf($item_like, "/%s", $regexp)==1)
-      $sql .= " AND ".TB_PREF."stock_master.stock_id RLIKE ".db_escape($regexp);
+      $sql .= " AND item.stock_id RLIKE ".db_escape($regexp);
     else
-      $sql .= " AND ".TB_PREF."stock_master.stock_id LIKE ".db_escape($item_like);
+      $sql .= " AND item.stock_id LIKE ".db_escape($item_like);
   }
-	$sql .= " GROUP BY ".TB_PREF."stock_master.category_id,
-		".TB_PREF."stock_category.description,
-		".TB_PREF."stock_master.stock_id,
-		".TB_PREF."stock_master.description
-		ORDER BY ".TB_PREF."stock_master.category_id,
-		".TB_PREF."stock_master.stock_id";
+	$sql .= " GROUP BY item.category_id,
+		category.description,
+		item.stock_id,
+		item.description
+		ORDER BY item.category_id,
+		item.stock_id";
 
     return db_query($sql,"No transactions were returned");
 }
@@ -71,16 +70,16 @@ function getTransactions($category, $location, $item_like)
 
 function print_stock_check()
 {
-    global $path_to_root, $pic_height;
-
-    	$category = $_POST['PARAM_0'];
-    	$location = $_POST['PARAM_1'];
-    	$pictures = $_POST['PARAM_2'];
-    	$check    = $_POST['PARAM_3'];
-    	$shortage = $_POST['PARAM_4'];
-    	$no_zeros = $_POST['PARAM_5'];
-    	$like     = $_POST['PARAM_6']; 
-    	$comments = $_POST['PARAM_7'];
+    global $path_to_root, $SysPrefs;
+
+   	$category = $_POST['PARAM_0'];
+   	$location = $_POST['PARAM_1'];
+   	$pictures = $_POST['PARAM_2'];
+   	$check    = $_POST['PARAM_3'];
+   	$shortage = $_POST['PARAM_4'];
+   	$no_zeros = $_POST['PARAM_5'];
+   	$like     = $_POST['PARAM_6']; 
+   	$comments = $_POST['PARAM_7'];
 	$orientation = $_POST['PARAM_8'];
 	$destination = $_POST['PARAM_9'];
 
@@ -133,12 +132,7 @@ function print_stock_check()
     				1 => array('text' => _('Category'), 'from' => $cat, 'to' => ''),
     				2 => array('text' => _('Location'), 'from' => $loc, 'to' => ''),
     				3 => array('text' => _('Only Shortage'), 'from' => $short, 'to' => ''),
-				4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
-
-	if ($pictures)
-		$user_comp = user_company();
-	else
-		$user_comp = "";
+					4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
 
    	$rep = new FrontReport(_('Stock Check Sheets'), "StockCheckSheet", user_pagesize(), 9, $orientation);
     if ($orientation == 'L')
@@ -204,10 +198,10 @@ function print_stock_check()
 			if (file_exists($image))
 			{
 				$rep->NewLine();
-				if ($rep->row - $pic_height < $rep->bottomMargin)
+				if ($rep->row - $SysPrefs->pic_height < $rep->bottomMargin)
 					$rep->NewPage();
-				$rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height);
-				$rep->row -= $pic_height;
+				$rep->AddImage($image, $rep->cols[1], $rep->row - $SysPrefs->pic_height, 0, $SysPrefs->pic_height);
+				$rep->row -= $SysPrefs->pic_height;
 				$rep->NewLine();
 			}
 		}
@@ -217,4 +211,3 @@ function print_stock_check()
     $rep->End();
 }
 
-?>