X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep302.php;h=0a633335cb86ec688afeb7afcdfa89dbf1d86f9a;hb=020667053df74a6490e60413c1e773a746c926b6;hp=6806e4c3931fabca11c49f040092b7d4a7e9b56f;hpb=b6b8d2e8a975b8be97c7fbb2f9aa0bd9399bfde0;p=fa-stable.git

diff --git a/reporting/rep302.php b/reporting/rep302.php
index 6806e4c3..0a633335 100644
--- a/reporting/rep302.php
+++ b/reporting/rep302.php
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
+$page_security = 'SA_ITEMSANALYTIC';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
@@ -34,7 +34,7 @@ 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.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,
@@ -44,9 +44,9 @@ function getTransactions($category, $location)
 		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')";
 	if ($category != 0)
-		$sql .= " AND ".TB_PREF."stock_master.category_id = '$category'";
+		$sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category);
 	if ($location != 'all')
-		$sql .= " AND ".TB_PREF."stock_moves.loc_code = '$location'";
+		$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,
@@ -97,19 +97,19 @@ function print_inventory_planning()
 	else
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
-	if ($category == reserved_words::get_all_numeric())
+	if ($category == ALL_NUMERIC)
 		$category = 0;
 	if ($category == 0)
 		$cat = _('All');
 	else
 		$cat = get_category_name($category);
 
-	if ($location == reserved_words::get_all())
+	if ($location == ALL_TEXT)
 		$location = 'all';
 	if ($location == 'all')
 		$loc = _('All');
 	else
-		$loc = $location;
+		$loc = get_location_name($location);
 
 	$cols = array(0, 50, 150, 180, 210, 240, 270, 300, 330, 390, 435, 480, 525);
 
@@ -154,7 +154,7 @@ function print_inventory_planning()
 		if ($location == 'all')
 			$loc_code = "";
 		else
-			$loc_code = $trans['loc_code'];
+			$loc_code = $location;
 		$custqty = get_demand_qty($trans['stock_id'], $loc_code);
 		$custqty += get_demand_asm_qty($trans['stock_id'], $loc_code);
 		$suppqty = get_on_porder_qty($trans['stock_id'], $loc_code);
@@ -163,13 +163,13 @@ function print_inventory_planning()
 		$rep->NewLine();
 		$dec = get_qty_dec($trans['stock_id']);
 		$rep->TextCol(0, 1, $trans['stock_id']);
-		$rep->TextCol(1, 2, $trans['description']);
+		$rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1);
 		$rep->AmountCol(2, 3, $period['prd0'], $dec);
 		$rep->AmountCol(3, 4, $period['prd1'], $dec);
 		$rep->AmountCol(4, 5, $period['prd2'], $dec);
 		$rep->AmountCol(5, 6, $period['prd3'], $dec);
 		$rep->AmountCol(6, 7, $period['prd4'], $dec);
-
+		
 		$MaxMthSales = Max($period['prd0'], $period['prd1'], $period['prd2'], $period['prd3']);
 		$IdealStockHolding = $MaxMthSales * 3;
 		$rep->AmountCol(7, 8, $IdealStockHolding, $dec);