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

diff --git a/reporting/rep104.php b/reporting/rep104.php
index 2c34f63a..eabb5956 100644
--- a/reporting/rep104.php
+++ b/reporting/rep104.php
@@ -38,7 +38,7 @@ function fetch_items($category=0)
 				".TB_PREF."stock_category.description
 			FROM ".TB_PREF."stock_master,
 				".TB_PREF."stock_category
-			WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id";
+			WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id AND NOT ".TB_PREF."stock_master.inactive";
 		if ($category != 0)
 			$sql .= " AND ".TB_PREF."stock_category.category_id = ".db_escape($category);
 		$sql .= " ORDER BY ".TB_PREF."stock_master.category_id,
@@ -66,7 +66,7 @@ function get_kits($category=0)
 
 function print_price_listing()
 {
-    global $comp_path, $path_to_root, $pic_height, $pic_width;
+    global $path_to_root, $pic_height, $pic_width;
 
     $currency = $_POST['PARAM_0'];
     $category = $_POST['PARAM_1'];
@@ -159,7 +159,7 @@ function print_price_listing()
 		}
 		if ($pictures)
 		{
-			$image = $comp_path . '/'. $user_comp . "/images/" 
+			$image = company_path(). "/images/" 
 				. item_img_name($myrow['stock_id']) . ".jpg";
 			if (file_exists($image))
 			{