X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep301.php;h=fbf5f3f2e35e03593e9ab1b3e2623dede4cee625;hb=b54fdb00859af85c72742d32ebc628ef52b81cec;hp=d476ec9a98cd2f3e568a27f763501c4cb9db2ccc;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/reporting/rep301.php b/reporting/rep301.php
index d476ec9a..fbf5f3f2 100644
--- a/reporting/rep301.php
+++ b/reporting/rep301.php
@@ -33,7 +33,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,
 			".TB_PREF."stock_moves.loc_code,
 			SUM(".TB_PREF."stock_moves.qty) AS QtyOnHand,
 			".TB_PREF."stock_master.material_cost + ".TB_PREF."stock_master.labour_cost + ".TB_PREF."stock_master.overhead_cost AS UnitCost,
@@ -52,9 +52,9 @@ function getTransactions($category, $location)
 			".TB_PREF."stock_master.description
 		HAVING SUM(".TB_PREF."stock_moves.qty) != 0";
 		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 ".TB_PREF."stock_moves.loc_code = ".db_escape($location);
 		$sql .= " ORDER BY ".TB_PREF."stock_master.category_id,
 			".TB_PREF."stock_master.stock_id";
 
@@ -76,7 +76,7 @@ function print_inventory_valuation_report()
 		include_once($path_to_root . "/reporting/includes/excel_report.inc");
 	else
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
-
+	$detail = !$detail;
     $dec = user_price_dec();
 
 	if ($category == ALL_NUMERIC)
@@ -91,7 +91,7 @@ function print_inventory_valuation_report()
 	if ($location == 'all')
 		$loc = _('All');
 	else
-		$loc = $location;
+		$loc = get_location_name($location);
 
 	$cols = array(0, 100, 250, 350, 450,	515);
 
@@ -107,7 +107,7 @@ function print_inventory_valuation_report()
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
 	$res = getTransactions($category, $location);
 	$total = $grandtotal = 0.0;
@@ -141,13 +141,13 @@ function print_inventory_valuation_report()
 		if ($detail)
 		{
 			$rep->NewLine();
-			$rep->fontsize -= 2;
+			$rep->fontSize -= 2;
 			$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, $trans['QtyOnHand'], get_qty_dec($trans['stock_id']));
 			$rep->AmountCol(3, 4, $trans['UnitCost'], $dec);
 			$rep->AmountCol(4, 5, $trans['ItemTotal'], $dec);
-			$rep->fontsize += 2;
+			$rep->fontSize += 2;
 		}
 		$total += $trans['ItemTotal'];
 		$grandtotal += $trans['ItemTotal'];