X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep104.php;h=c2dc63a3716866014262e38a2c72eadb12a540e7;hb=d8d40a67b517dd35425a1fa0eb02f84c3f9fd843;hp=ebca98df461373b4595d7eeccc504a707b164171;hpb=1571869d54be48452fdbe08f25130972ff0a7b5a;p=fa-stable.git

diff --git a/reporting/rep104.php b/reporting/rep104.php
index ebca98df..c2dc63a3 100644
--- a/reporting/rep104.php
+++ b/reporting/rep104.php
@@ -32,17 +32,17 @@ print_price_listing();
 
 function fetch_items($category=0)
 {
-		$sql = "SELECT ".TB_PREF."stock_master.stock_id, ".TB_PREF."stock_master.description AS name,
-				".TB_PREF."stock_master.material_cost+".TB_PREF."stock_master.labour_cost+".TB_PREF."stock_master.overhead_cost AS Standardcost,
-				".TB_PREF."stock_master.category_id,".TB_PREF."stock_master.units,
-				".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 AND NOT ".TB_PREF."stock_master.inactive";
+		$sql = "SELECT item.stock_id, item.description AS name,
+				item.material_cost AS Standardcost,
+				item.category_id,item.units,
+				category.description
+			FROM ".TB_PREF."stock_master item,
+				".TB_PREF."stock_category category
+			WHERE item.category_id=category.category_id AND NOT item.inactive";
 		if ($category != 0)
-			$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";
+			$sql .= " AND category.category_id = ".db_escape($category);
+		$sql .= " AND item.mb_flag<> 'F' ORDER BY item.category_id,
+				item.stock_id";
 
     return db_query($sql,"No transactions were returned");
 }
@@ -51,11 +51,9 @@ function get_kits($category=0)
 {
 	$sql = "SELECT i.item_code AS kit_code, i.description AS kit_name, c.category_id AS cat_id, c.description AS cat_name, count(*)>1 AS kit
 			FROM
-			".TB_PREF."item_codes i
-			LEFT JOIN
-			".TB_PREF."stock_category c
-			ON i.category_id=c.category_id";
-	$sql .=	" WHERE !i.is_foreign AND i.item_code!=i.stock_id";
+				".TB_PREF."item_codes i
+				LEFT JOIN ".TB_PREF."stock_category c ON i.category_id=c.category_id
+			WHERE !i.is_foreign AND i.item_code!=i.stock_id";
 	if ($category != 0)
 		$sql .= " AND c.category_id = ".db_escape($category);
 	$sql .= " GROUP BY i.item_code";
@@ -66,7 +64,7 @@ function get_kits($category=0)
 
 function print_price_listing()
 {
-    global $path_to_root, $pic_height, $pic_width;
+    global $path_to_root, $SysPrefs;
 
     $currency = $_POST['PARAM_0'];
     $category = $_POST['PARAM_1'];
@@ -169,10 +167,10 @@ function print_price_listing()
 			if (file_exists($image))
 			{
 				$rep->NewLine();
-				if ($rep->row - $pic_height < $rep->bottomMargin)
+				if ($rep->row - $SysPrefs->pic_height < $rep->bottomMargin)
 					$rep->NewPage();
-				$rep->AddImage($image, $rep->cols[1], $rep->row - $pic_height, 0, $pic_height);
-				$rep->row -= $pic_height;
+				$rep->AddImage($image, $rep->cols[1], $rep->row - $SysPrefs->pic_height, 0, $SysPrefs->pic_height);
+				$rep->row -= $SysPrefs->pic_height;
 				$rep->NewLine();
 			}
 		}
@@ -215,4 +213,3 @@ function print_price_listing()
     $rep->End();
 }
 
-?>
\ No newline at end of file