X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep104.php;h=c2dc63a3716866014262e38a2c72eadb12a540e7;hb=13fae1ba1d78cff66e326a006be2f538dd404248;hp=f73a2c4a2a079c9f3b49b73da73acb795a50af7e;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git

diff --git a/reporting/rep104.php b/reporting/rep104.php
index f73a2c4a..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";