X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep302.php;h=cdfd0e9a21e89d81a92422c3d063453f77f6d2ae;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=55c766c02440db9448d6e0a3556573e5dd6d85ed;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git

diff --git a/reporting/rep302.php b/reporting/rep302.php
index 55c766c0..cdfd0e9a 100644
--- a/reporting/rep302.php
+++ b/reporting/rep302.php
@@ -31,28 +31,27 @@ print_inventory_planning();
 
 function getTransactions($category, $location)
 {
-	$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.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 qty_on_hand
-		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.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 qty_on_hand
+		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 .= " 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 .= " AND IF(move.stock_id IS NULL, '1=1',move.loc_code = ".db_escape($location).")";
+	$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");