X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=f965991155997ef2032a1e8d4894dcfeeb1fb77e;hb=b0a033a1a2db727664018c496730a8be240879ec;hp=ba5f42a465d03561d3f176215ddcbb1245ed21d6;hpb=5af53b13622ca77bc851cccaa087d7e2aedc3401;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index ba5f42a4..f9659911 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -3,7 +3,7 @@
 include_once($path_to_root . "/includes/banking.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,8 +18,10 @@ 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]);
-	$no_supplier_list = get_company_pref('no_supplier_list');
-	if ($no_supplier_list)
+	
+
+	$supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ";
+	if (get_company_pref('no_supplier_list'))
 	{
 		global $search_button;
 		$edit_name = $name."_edit";
@@ -29,34 +31,25 @@ function supplier_list($name, $selected_id, $all_option=false, $submit_on_change
 		if (isset($_POST[$edit_button]))
 		{
 			$selected_id = $_POST[$name] = "";
+			set_focus($name);
 		}
 
 		if ($selected_id != "")
 		{
 			$val = DEFVAL;
-			$supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers WHERE supplier_id=$selected_id";
-			$supplier_result = db_query($supplier_sql);
+			$supplier_sql .= "WHERE supplier_id=$selected_id";
 		}
-		else
+		elseif ($val != "" && $val != DEFVAL)
 		{
-			if ($val != "" && $val != DEFVAL)
-			{
-				$supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers WHERE supp_name LIKE '%{$val}%' ORDER BY supp_name";
-				$supplier_result = db_query($supplier_sql);
-			}
-			else
-				$supplier_result = false;
+			$supplier_sql .= "WHERE supp_name LIKE '%{$val}%'";
 		}
 
 		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 = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ORDER BY supp_name";
-		$supplier_result = db_query($supplier_sql);
-	}
+
+	$supplier_result = db_query($supplier_sql." ORDER BY supp_name");
 
 	if ($submit_on_change==true)
 		echo "<select name='$name' onchange='this.form.submit();'>";
@@ -133,8 +126,9 @@ function customer_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]);
-	$no_customer_list = get_company_pref('no_customer_list');
-	if ($no_customer_list)
+
+	$customer_sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ";
+	if (get_company_pref('no_customer_list'))
 	{
 		global $search_button;
 		$edit_name = $name."_edit";
@@ -145,34 +139,25 @@ function customer_list($name, $selected_id, $all_option=false, $submit_on_change
 		{
 			$selected_id = $_POST[$name] = "";
 			$_POST['branch_id'] = "";
+			set_focus($name);
 		}
-
 		if ($selected_id != "")
 		{
 			$val = DEFVAL;
-			$customer_sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master WHERE debtor_no=$selected_id";
-			$customer_result = db_query($customer_sql);
+			$customer_sql .= "WHERE debtor_no=$selected_id";
 		}
-		else
-		{
-			if ($val != "" && $val != DEFVAL)
+		elseif ($val != "" && $val != DEFVAL)
 			{
-				$customer_sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master WHERE name LIKE '%{$val}%' ORDER BY name";
-				$customer_result = db_query($customer_sql);
+				$customer_sql .= "WHERE name LIKE '%{$val}%'";
 			}
-			else
-				$customer_result = false;
-		}
-
 		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 = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ORDER BY name";
-		$customer_result = db_query($customer_sql);
-	}
+
+
+	$customer_result = db_query($customer_sql." ORDER BY name");
+
 	if ($submit_on_change==true)
 		echo "<select name='$name' onchange='this.form.submit();'>";
 	else
@@ -619,8 +604,12 @@ 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]);
-	$no_item_list = get_company_pref('no_item_list');
-	if ($no_item_list)
+	
+
+	$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";
+
+	if (get_company_pref('no_item_list'))
 	{
 		global $search_button;
 		$edit_name = $name."_edit";
@@ -631,41 +620,26 @@ function stock_items_list($name, $selected_id, $all_option=false, $submit_on_cha
 		if (isset($_POST[$edit_button]))
 		{
 			$selected_id = $_POST[$name] = "";
+			set_focus($name);
 		}
-
 		if ($selected_id != "")
 		{
 			$val = DEFVAL;
-			$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 stock_id='$selected_id'";
-			$result = db_query($sql);
+			$sql .= " AND stock_id='$selected_id'";
 		}
-		else
+		elseif ($val != "" && $val != DEFVAL)
 		{
-			if ($val != "" && $val != DEFVAL)
-			{
-				$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
+				$sql .= " AND
 					(stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
 					.TB_PREF."stock_master.description LIKE '%{$val}%')";
-				$result = db_query($sql);
-			}
-			else
-				$result = false;
 		}
 
 		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
-	{
-		$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";
-		$result = db_query($sql);
-	}
+	$result = db_query($sql);
+
 
 	if ($submit_on_change==true)
 		echo "<select name='$name' onchange='this.form.submit();'>";
@@ -914,8 +888,11 @@ 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]);
-	$no_item_list = get_company_pref('no_item_list');
-	if ($no_item_list)
+	
+	$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'))
 	{
 		$edit_name = $name."_edit";
 		$edit_button = $name."_button";
@@ -924,42 +901,27 @@ function stock_purchasable_items_list($name, &$selected_id,	$all_option=false, $
 		if (isset($_POST[$edit_button]))
 		{
 			$selected_id = $_POST[$name] = "";
+			set_focus($name);
 		}
 
 		if ($selected_id != "")
 		{
 			$val = DEFVAL;
-			$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' AND stock_id='$selected_id'";
-			$result = db_query($sql);
+			$sql .= "AND stock_id='$selected_id'";
 		}
-		else
+		elseif ($val != "" && $val != DEFVAL)
 		{
-			if ($val != "" && $val != DEFVAL)
-			{
-				$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' AND
-					(stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
-					.TB_PREF."stock_master.description LIKE '%{$val}%')";
-				$result = db_query($sql);
-			}
-			else
-				$result = false;
+			$sql = "AND
+				(stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
+				.TB_PREF."stock_master.description LIKE '%{$val}%')";
 		}
 
 		echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' > ";
 
 		echo "<input type='submit' class='inputsubmit' name='$edit_button' value='?'> ";
 	}
-	else
-	{
-		$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'";
-		$result = db_query($sql);
-	}
+
+	$result = db_query($sql);
 
 	if ($submit_on_change==true)
 		echo "<select name='$name' onchange='this.form.submit();'>";
@@ -1612,12 +1574,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)
@@ -1664,21 +1626,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";
 }
 
@@ -1993,7 +1955,7 @@ function decseps_list_row($label, $name, $value)
 function themes_list_row($label, $name, $value)
 {
 	global $path_to_root;
-	
+
 	default_focus($name);
 	$path = $path_to_root.'/themes/';
 	$themes = array();
@@ -2001,7 +1963,7 @@ function themes_list_row($label, $name, $value)
 	while(false !== ($fname = readdir($themedir))) {
 	    if($fname!='.' && $fname!='..' && $fname!='CVS' && is_dir($path.$fname)) {
 			$themes[] =  $fname;
-	    } 
+	    }
 	}
 	sort($themes);
 	echo "<tr><td>$label</td>\n";