Cleanup in popup lists related files.

[fa-stable.git] / purchasing / inquiry / suppliers_list.php

diff --git a/purchasing/inquiry/suppliers_list.php b/purchasing/inquiry/suppliers_list.php
index 11bb108f52ff6d5f6cf29923cfd3d2a2ea713866..75c1395921d6839e003a5a9ceff9e9828e05522b 100644 (file)
--- a/purchasing/inquiry/suppliers_list.php
+++ b/purchasing/inquiry/suppliers_list.php
@@ -1,12 +1,24 @@
 <?php
 /**********************************************************************
-  Page for searching item list and select it to item selection
-  in sales order and purchase order.
+    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 supplier list and select it to supplier selection
+  in pages that have the supplier dropdown lists.
+  Author: bogeyman2007 from Discussion Forum. Modified by Joe Hunt
 ***********************************************************************/
 $page_security = "SA_PURCHASEORDER";
 $path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/ui.inc");
+include_once($path_to_root . "/purchasing/includes/db/suppliers_db.inc");
 
 $mode = get_company_pref('no_supplier_list');
 if ($mode != 0)
@@ -16,18 +28,10 @@ else
 
 page(_($help_context = "Suppliers"), 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("supplier_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,13 +46,6 @@ end_row();
 end_table();
 
 end_form();
-// END: Filter form
-
-// BEGIN: Link to add new supplier
-// hyperlink_params($path_to_root . "/purchasing/manage/suppliers.php", _("Add new"), "popup=1");
-// END: Link to add new supplier
-
-// BEGIN: Supplier list
 div_start("supplier_tbl");
 
 start_table(TABLESTYLE);
@@ -57,17 +54,9 @@ $th = array("", _("Supplier"), _("Short Name"), _("Address"), _("Tax ID"));
 
 table_header($th);
 
-// Query based on function supplier_list in includes/ui/ui_lists.inc.
-$sql = "SELECT supplier_id, supp_name, supp_ref, address, gst_no FROM ".TB_PREF."suppliers
-  WHERE (supp_name LIKE " . db_escape("%" . get_post("supplier"). "%") . " OR 
-          supp_ref LIKE " . db_escape("%" . get_post("supplier"). "%") . " OR 
-           address LIKE " . db_escape("%" . get_post("supplier"). "%") . " OR 
-            gst_no LIKE " . db_escape("%" . get_post("supplier"). "%") . ")
-  ORDER BY supp_name LIMIT 0, $limit"; // We only display 10 items.
-$result = db_query($sql, "Failed in retreiving supplier list.");
-
-$k = 0; //row colour counter
+$k = 0;
 $name = $_GET["client_id"];
+$result = get_suppliers_search(get_post("supplier"));
 while ($myrow = db_fetch_assoc($result)) {
        alt_table_row_color($k);
        $value = $myrow['supplier_id'];
@@ -86,8 +75,5 @@ while ($myrow = db_fetch_assoc($result)) {
 }
 
 end_table(1);
-
 div_end();
-// END: Supplier list
-
 end_page(true);