X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Finquiry%2Fstock_list.php;h=22884885081aadf82a9fcc8ae54da7bd7aa4e874;hb=ab24fcc549bb72e495fb85e5dcad41bc14d85b7d;hp=1d1c5890b6f67bbbac1cc035da1649a827497f30;hpb=1ca0c7081f7a4cb3f68f3ffb6ee05739abb6cebf;p=fa-stable.git

diff --git a/inventory/inquiry/stock_list.php b/inventory/inquiry/stock_list.php
index 1d1c5890..22884885 100644
--- a/inventory/inquiry/stock_list.php
+++ b/inventory/inquiry/stock_list.php
@@ -1,12 +1,24 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 /**********************************************************************
   Page for searching item list and select it to item selection
-  in sales order and purchase order.
+  in pages that have the item dropdown lists.
+  Author: bogeyman2007 from Discussion Forum. Modified by Joe Hunt
 ***********************************************************************/
 $page_security = "SA_ITEM";
 $path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/ui.inc");
+include_once($path_to_root . "/inventory/includes/db/items_db.inc");
 
 $mode = get_company_pref('no_item_list');
 if ($mode != 0)
@@ -16,18 +28,10 @@ else
 
 page(_($help_context = "Items"), true, false, "", $js);
 
-if (isset($SysPrefs->max_rows_in_search))
-	$limit = $SysPrefs->max_rows_in_search;
-else
-	$limit = 10;
-
-// Activate Ajax on form submit
 if(get_post("search")) {
   $Ajax->activate("item_tbl");
 }
 
-// BEGIN: Filter form. Use query string so the client_id will not disappear
-// after ajax form post.
 start_form(false, false, $_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING']);
 
 start_table(TABLESTYLE_NOBORDER);
@@ -42,72 +46,19 @@ end_row();
 end_table();
 
 end_form();
-// END: Filter form
 
-// BEGIN: Link to add new item
-// hyperlink_params($path_to_root . "/inventory/manage/items.php", _("Add new"), "popup=1");
-// END: Link to add new item
-
-// BEGIN: Item list
 div_start("item_tbl");
-
 start_table(TABLESTYLE);
 
 $th = array("", _("Item Code"), _("Description"), _("Category"));
-
 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
-    ON i.category_id=c.category_id
-  WHERE i.stock_id=s.stock_id
-    AND !i.inactive AND !s.inactive
-    AND (  i.item_code LIKE " . db_escape("%" . get_post("description"). "%") . " OR 
-         i.description LIKE " . db_escape("%" . get_post("description"). "%") . " OR 
-         c.description LIKE " . db_escape("%" . get_post("description"). "%") . ") ";
-
-$type = "";
-if (isset($_GET['type'])) {
-  $type = $_GET['type'];
-}
-//_vd("type = $type");
-switch ($type) {
-  case "sales":
-    $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";
-    break;
-  case "costable":
-    $sql .= " AND mb_flag != 'D' AND mb_flag != 'F' AND  i.item_code=i.stock_id";
-    break;
-  case "assets":
-    $sql .= " AND mb_flag = 'F'";
-    break;
-  case "kits":
-  	$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";
-    // 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
+$k = 0;
 $name = $_GET["client_id"];
-while ($myrow = db_fetch_assoc($result)) {
+$result = get_items_search(get_post("description"), @$_GET['type']);
+
+while ($myrow = db_fetch_assoc($result))
+{
 	alt_table_row_color($k);
 	$value = $myrow['item_code'];
 	if ($mode != 0) {
@@ -126,6 +77,4 @@ while ($myrow = db_fetch_assoc($result)) {
 end_table(1);
 
 div_end();
-// END: Item list
-
 end_page(true);