X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=50bcbfebbb12d9255267b7fe90f8757c17dd2bc4;hb=bcbf5c697db09a36994f391b5fe568d269145c68;hp=7c31bd692e85b2b804979a41f8723ab17bb103a0;hpb=7792e42d75607b7e2dbaf73c318b8b7d9367dd17;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 7c31bd69..50bcbfeb 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -1,9 +1,11 @@
 <?php
 
 include_once($path_to_root . "/includes/banking.inc");
+include_once($path_to_root . "/includes/reserved.inc");
+include_once($path_to_root . "/includes/types.inc");
 
 define("DEFVAL", "--");
-$search_button = "<input type='submit' class='inputsubmit' style='border:0;background:url($path_to_root/themes/default/images/locate.png) no-repeat;' name='%s' value='?' title='"._("Search")."'> ";
+$search_button = "<input type='submit' class='combo_submit' style='border:0;background:url($path_to_root/themes/default/images/locate.png) no-repeat;' name='%s' value='?' title='"._("Search")."'> ";
 //$search_button = "<input type='submit' class='inputsubmit' name='%s' value='?'> ";
 
 $all_items = reserved_words::get_all();
@@ -18,7 +20,7 @@ function supplier_list($name, $selected_id, $all_option=false, $submit_on_change
 	default_focus($name);
 	if ($selected_id == null)
 		$selected_id = ((!isset($_POST[$name]) || $_POST[$name] == "") ? "" : $_POST[$name]);
-	
+
 
 	$supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ";
 	if (get_company_pref('no_supplier_list'))
@@ -41,15 +43,19 @@ function supplier_list($name, $selected_id, $all_option=false, $submit_on_change
 		}
 		elseif ($val != "" && $val != DEFVAL)
 		{
-			$supplier_sql .= "WHERE supp_name LIKE '%{$val}%'";
+			$supplier_sql .= "WHERE supp_name LIKE '%{$val}%' ORDER BY supp_name";
 		}
+		else
+			$supplier_sql .= "ORDER BY supp_name LIMIT 1";
 
 		echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
 
 		echo sprintf($search_button, $edit_button);
 	}
+	else
+		$supplier_sql .= "ORDER BY supp_name";
 
-	$supplier_result = db_query($supplier_sql." ORDER BY supp_name");
+	$supplier_result = db_query($supplier_sql);
 
 	if ($submit_on_change==true)
 		echo "<select name='$name' onchange='this.form.submit();'>";
@@ -147,16 +153,19 @@ function customer_list($name, $selected_id, $all_option=false, $submit_on_change
 			$customer_sql .= "WHERE debtor_no=$selected_id";
 		}
 		elseif ($val != "" && $val != DEFVAL)
-			{
-				$customer_sql .= "WHERE name LIKE '%{$val}%'";
-			}
+		{
+			$customer_sql .= "WHERE name LIKE '%{$val}%' ORDER BY name";
+		}
+		else
+			$customer_sql .= "ORDER BY name LIMIT 1";
 		echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
 
 		echo sprintf($search_button, $edit_button);
 	}
+	else
+		$customer_sql .= "ORDER BY name";
 
-
-	$customer_result = db_query($customer_sql." ORDER BY name");
+	$customer_result = db_query($customer_sql);
 
 	if ($submit_on_change==true)
 		echo "<select name='$name' onchange='this.form.submit();'>";
@@ -604,7 +613,7 @@ function stock_items_list($name, $selected_id, $all_option=false, $submit_on_cha
 	default_focus($name);
 	if ($selected_id == null)
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	
+
 
 	$sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".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";
@@ -629,11 +638,12 @@ function stock_items_list($name, $selected_id, $all_option=false, $submit_on_cha
 		}
 		elseif ($val != "" && $val != DEFVAL)
 		{
-				$sql .= " AND
-					(stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
-					.TB_PREF."stock_master.description LIKE '%{$val}%')";
+			$sql .= " AND
+				(stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
+				.TB_PREF."stock_master.description LIKE '%{$val}%')";
 		}
-
+		else
+			$sql .= " LIMIT 1";
 		echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
 
 		echo sprintf($search_button, $edit_button);
@@ -641,12 +651,10 @@ function stock_items_list($name, $selected_id, $all_option=false, $submit_on_cha
 	$result = db_query($sql);
 
 
-	if ($submit_on_change==true)
-		echo "<select name='$name' onchange='this.form.submit();'>";
-	else if ($extra != "")
-		echo "<select name='$name' $extra>";
-	else
-		echo "<select name='$name'>";
+    echo "<select name='$name'".
+	    ($submit_on_change ? " onchange='this.form.submit();'" : '').
+	    ($extra=='' ? '' : " $extra").
+	">";
 
 	if (($all_option == true))
 	{
@@ -888,12 +896,13 @@ function stock_purchasable_items_list($name, &$selected_id,	$all_option=false, $
 	default_focus($name);
 	if ($selected_id == null)
 		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	
+
 	$sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".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 mb_flag !='M' ";
 	if (get_company_pref('no_item_list'))
 	{
+		global $search_button;
 		$edit_name = $name."_edit";
 		$edit_button = $name."_button";
 
@@ -911,14 +920,15 @@ function stock_purchasable_items_list($name, &$selected_id,	$all_option=false, $
 		}
 		elseif ($val != "" && $val != DEFVAL)
 		{
-			$sql = "AND
+			$sql .= "AND
 				(stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
 				.TB_PREF."stock_master.description LIKE '%{$val}%')";
 		}
+		else
+			$sql .= "LIMIT 1";
+		echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
 
-		echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' > ";
-
-		echo "<input type='submit' class='inputsubmit' name='$edit_button' value='?'> ";
+		echo sprintf($search_button, $edit_button);
 	}
 
 	$result = db_query($sql);
@@ -1276,25 +1286,26 @@ function credit_status_list_row($label, $name, $selected_id)
 
 //-----------------------------------------------------------------------------------------------
 
-function sales_types_list($name, $selected_id, $submit_on_change=false)
+function sales_types_list($name, $selected_id, $submit_on_change=false, $special_option=null)
 {
 	simple_codeandname_list("SELECT id, sales_type FROM ".TB_PREF."sales_types",
-		$name, $selected_id, false, null, false, $submit_on_change);
+		$name, $selected_id,
+		isset($special_option), $special_option, true, $submit_on_change);
 }
 
-function sales_types_list_cells($label, $name, $selected_id, $submit_on_change=false)
+function sales_types_list_cells($label, $name, $selected_id, $submit_on_change=false, $special_option=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
-	sales_types_list($name, $selected_id, $submit_on_change);
+	sales_types_list($name, $selected_id, $submit_on_change, $special_option);
 	echo "</td>\n";
 }
 
-function sales_types_list_row($label, $name, $selected_id, $submit_on_change=false)
+function sales_types_list_row($label, $name, $selected_id, $submit_on_change=false, $special_option=null)
 {
 	echo "<tr>\n";
-	sales_types_list_cells($label, $name, $selected_id, $submit_on_change);
+	sales_types_list_cells($label, $name, $selected_id, $submit_on_change, $special_option);
 	echo "</tr>\n";
 }
 
@@ -1574,12 +1585,12 @@ function gl_account_types_list_row($label, $name, $selected_id, $all_option=fals
 //-----------------------------------------------------------------------------------------------
 
 function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false,
-	$show_group=false, $onchange="")
+	$show_group=false, $params="")
 {
 	default_focus($name);
 	echo "<select name='$name'";
-	if ($onchange != "")
-		echo " onchange='$onchange'";
+	if ($params != "")
+		echo " $params";
 	echo ">";
 
 	if ($skip_bank_accounts)
@@ -1626,21 +1637,21 @@ function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false,
 }
 
 function gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts=false,
-	$show_group=false, $onchange="")
+	$show_group=false, $params="")
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
-	gl_all_accounts_list($name, $selected_id, $skip_bank_accounts, $show_group, $onchange);
+	gl_all_accounts_list($name, $selected_id, $skip_bank_accounts, $show_group, $params);
 	echo "</td>\n";
 }
 
 function gl_all_accounts_list_row($label, $name, $selected_id, $skip_bank_accounts=false,
-	$show_group=false, $onchange="")
+	$show_group=false, $params="")
 {
 	echo "<tr>\n";
 	gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts,
-		$show_group, $onchange);
+		$show_group, $params);
 	echo "</tr>\n";
 }