X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep104.php;h=2c34f63a096d4ece97ea05de1ef5f5200b2d7e64;hb=b37623cf1de2cfce6825744557d76475f002321f;hp=42eed72221a47de131e3e05ce6171b0fd705220d;hpb=21290a4a16ca78fe736f62cf1cb039c06cb53fca;p=fa-stable.git

diff --git a/reporting/rep104.php b/reporting/rep104.php
index 42eed722..2c34f63a 100644
--- a/reporting/rep104.php
+++ b/reporting/rep104.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_PRICEREP';
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
@@ -40,7 +40,7 @@ function fetch_items($category=0)
 				".TB_PREF."stock_category
 			WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id";
 		if ($category != 0)
-			$sql .= " AND ".TB_PREF."stock_category.category_id = '$category'";
+			$sql .= " AND ".TB_PREF."stock_category.category_id = ".db_escape($category);
 		$sql .= " ORDER BY ".TB_PREF."stock_master.category_id,
 				".TB_PREF."stock_master.stock_id";
 
@@ -57,7 +57,7 @@ function get_kits($category=0)
 			ON i.category_id=c.category_id";
 	$sql .=	" WHERE !i.is_foreign AND i.item_code!=i.stock_id";
 	if ($category != 0)
-		$sql .= " AND c.category_id = '$category'";
+		$sql .= " AND c.category_id = ".db_escape($category);
 	$sql .= " GROUP BY i.item_code";
     return db_query($sql,"No kits were returned");
 }
@@ -83,13 +83,13 @@ function print_price_listing()
     $dec = user_price_dec();
 
 	$home_curr = get_company_pref('curr_default');
-	if ($currency == reserved_words::get_all())
+	if ($currency == ALL_TEXT)
 		$currency = $home_curr;
 	$curr = get_currency($currency);
 	$curr_sel = $currency . " - " . $curr['currency'];
-	if ($category == reserved_words::get_all_numeric())
+	if ($category == ALL_NUMERIC)
 		$category = 0;
-	if ($salestype == reserved_words::get_all_numeric())
+	if ($salestype == ALL_NUMERIC)
 		$salestype = 0;
 	if ($category == 0)
 		$cat = _('All');
@@ -125,7 +125,7 @@ function print_price_listing()
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
 	$result = fetch_items($category);
 
@@ -165,7 +165,7 @@ function print_price_listing()
 			{
 				$rep->NewLine();
 				if ($rep->row - $pic_height < $rep->bottomMargin)
-					$rep->Header();
+					$rep->NewPage();
 				$rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height);
 				$rep->row -= $pic_height;
 				$rep->NewLine();