X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=reporting%2Frep302.php;h=cdeae91dc7e4be8c7e5ca383afbdfa0a77635a25;hb=05d1e1fc65fe68645b540e06884db0e9f24b1a21;hp=08fd8d2af29ce5be489e0f26581d898dc67e7091;hpb=c8f27f36721cfd5e02e62965f40ff3c3933dbd7d;p=fa-stable.git

diff --git a/reporting/rep302.php b/reporting/rep302.php
index 08fd8d2a..cdeae91d 100644
--- a/reporting/rep302.php
+++ b/reporting/rep302.php
@@ -34,13 +34,13 @@ 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,
 			".TB_PREF."stock_category)
 		LEFT JOIN ".TB_PREF."stock_moves ON
-			(".TB_PREF."stock_master.stock_id=".TB_PREF."stock_moves.stock_id OR ".TB_PREF."stock_master.stock_id IS NULL)
+			(".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')";
 	if ($category != 0)
@@ -133,7 +133,7 @@ function print_inventory_planning()
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
 	$res = getTransactions($category, $location);
 	$catt = '';
@@ -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);