Removed fixed assets from list item search and popup search.

[fa-stable.git] / inventory / inquiry / stock_list.php

diff --git a/inventory/inquiry/stock_list.php b/inventory/inquiry/stock_list.php
index 1d1c5890b6f67bbbac1cc035da1649a827497f30..d33ab81a65b89ef50795c2a8148d84f502668cc7 100644 (file)
--- a/inventory/inquiry/stock_list.php
+++ b/inventory/inquiry/stock_list.php
@@ -59,11 +59,8 @@ table_header($th);
 
 // Query based on function sales_items_list in includes/ui/ui_lists.inc.
 $sql = "SELECT COUNT(i.item_code) AS kit, i.item_code, i.description, c.description category
-  FROM
-    ".TB_PREF."stock_master s,
-    ".TB_PREF."item_codes i
-  LEFT JOIN
-    ".TB_PREF."stock_category c
+  FROM ".TB_PREF."stock_master s, ".TB_PREF."item_codes i
+  LEFT JOIN ".TB_PREF."stock_category c
     ON i.category_id=c.category_id
   WHERE i.stock_id=s.stock_id
     AND !i.inactive AND !s.inactive
@@ -75,34 +72,35 @@ $type = "";
 if (isset($_GET['type'])) {
   $type = $_GET['type'];
 }
-//_vd("type = $type");
+
 switch ($type) {
   case "sales":
-    $sql .= " AND !s.no_sale AND mb_flag != 'F'";
+    $sql .= " AND !s.no_sale AND mb_flag <> 'F'";
     break;
   case "manufactured":
     $sql .= " AND mb_flag = 'M'";
     break;
   case "purchasable":
-    $sql .= " AND NOT no_purchase AND mb_flag != 'F' AND i.item_code=i.stock_id";
+    $sql .= " AND NOT no_purchase AND mb_flag <> 'F' AND i.item_code=i.stock_id";
     break;
   case "costable":
-    $sql .= " AND mb_flag != 'D' AND mb_flag != 'F' AND  i.item_code=i.stock_id";
+    $sql .= " AND mb_flag <> 'D' AND mb_flag <> 'F' AND  i.item_code=i.stock_id";
     break;
-  case "assets":
-    $sql .= " AND mb_flag = 'F'";
+  case "component":
+       $parent = $_GET['parent'];
+    $sql .= " AND  i.item_code=i.stock_id AND i.stock_id <> '$parent' AND mb_flag <> 'F' ";
     break;
   case "kits":
-       $sql .= " AND !i.is_foreign AND i.item_code!=i.stock_id AND mb_flag != 'F'";
+       $sql .= " AND !i.is_foreign AND i.item_code!=i.stock_id AND mb_flag <> 'F'";
        break;
   case "all":
-    $sql .= " AND mb_flag != 'F' AND i.item_code=i.stock_id";
+    $sql .= " AND mb_flag <> 'F' AND i.item_code=i.stock_id";
     // NOTHING TO DO.
     break;
 }
 
 $sql .= " GROUP BY i.item_code ORDER BY i.description LIMIT 0, $limit"; // We only display 10 items.
-//_vd($sql);
+
 $result = db_query($sql, "Failed in retreiving item list.");
 
 $k = 0; //row colour counter