X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=45253e32fd01c20585149b7fb935d012d4d7d051;hb=c9cb6e8b05e007305888f244807abda14632205e;hp=8e4da29d0f467e6e59cf4874cc9b8a532661fd91;hpb=d32bf132413c22c5a19966160fcd574346f63b24;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 8e4da29d..45253e32 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -150,7 +150,7 @@ $opts = array(		// default options
 					foreach($opts['search'] as $i=> $s)
 						$opts['search'][$i] = $s . " LIKE "
 							.db_escape(($class=='combo3' ? '' : '%').$txt.'%');
-					$opts['where'][] = '('. implode($opts['search'], ' OR ') . ')';
+					$opts['where'][] = '('. implode(' OR ', $opts['search']) . ')';
 				}
 		}
 	}
@@ -158,7 +158,7 @@ $opts = array(		// default options
 	// sql completion
 	if (count($opts['where'])) {
 		$where = strpos($sql, 'WHERE')==false ? ' WHERE ':' AND ';
-		$where .= '('. implode($opts['where'], ' AND ') . ')';
+		$where .= '('. implode(' AND ', $opts['where']) . ')';
 		$group_pos = strpos($sql, 'GROUP BY');
 		if ($group_pos) {
 			$group = substr($sql, $group_pos);
@@ -302,55 +302,57 @@ $opts = array(		// default options
 		$link = "";
   		$id = $name;
   		if ($SysPrefs->use_popup_windows) {
-    		switch (strtolower($type)) {
-      			case "stock":
-        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=all&client_id=" . $id;
-        			$img_title = _("Search items");
-        			break;
-      			case "stock_manufactured":
-        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=manufactured&client_id=" . $id;
-        			$img_title = _("Search items");
-        			break;
-      			case "stock_purchased":
-        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=purchasable&client_id=" . $id;
-        			$img_title = _("Search items");
-        			break;
-      			case "stock_sales":
-        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=sales&client_id=" . $id;
-        			$img_title = _("Search items");
-        			break;
-      			case "stock_costable":
-        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=costable&client_id=" . $id;
-        			$img_title = _("Search items");
-        			break;
-      			case "component":
-      				$parent = $opts['parent'];
-        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=component&parent=".$parent."&client_id=" . $id;
-        			$img_title = _("Search items");
-        			break;
-      			case "kits":
-        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=kits&client_id=" . $id;
-        			$img_title = _("Search items");
-        			break;
-      			case "customer":
-        			$link = $path_to_root . "/sales/inquiry/customers_list.php?popup=1&client_id=" . $id;
-        			$img_title = _("Search customers");
-        			break;
-      			case "branch":
-        			$link = $path_to_root . "/sales/inquiry/customer_branches_list.php?popup=1&client_id=" . $id . "#customer_id";
-        			$img_title = _("Search branches");
-        			break;
-      			case "supplier":
-        			$link = $path_to_root . "/purchasing/inquiry/suppliers_list.php?popup=1&client_id=" . $id;
-        			$img_title = _("Search suppliers");
-        			break;
-      			case "account":
-      			case "account2":
-      				$skip = strtolower($type) == "account" ? false : true;
-        			$link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&skip=".$skip."&client_id=" . $id;
-        			$img_title = _("Search GL accounts");
-        			break;
-    		}
+  			if ($type != NULL) {
+	    		switch (strtolower($type)) {
+	      			case "stock":
+	        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=all&client_id=" . $id;
+	        			$img_title = _("Search items");
+	        			break;
+	      			case "stock_manufactured":
+	        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=manufactured&client_id=" . $id;
+	        			$img_title = _("Search items");
+	        			break;
+	      			case "stock_purchased":
+	        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=purchasable&client_id=" . $id;
+	        			$img_title = _("Search items");
+	        			break;
+	      			case "stock_sales":
+	        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=sales&client_id=" . $id;
+	        			$img_title = _("Search items");
+	        			break;
+	      			case "stock_costable":
+	        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=costable&client_id=" . $id;
+	        			$img_title = _("Search items");
+	        			break;
+	      			case "component":
+	      				$parent = $opts['parent'];
+	        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=component&parent=".$parent."&client_id=" . $id;
+	        			$img_title = _("Search items");
+	        			break;
+	      			case "kits":
+	        			$link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=kits&client_id=" . $id;
+	        			$img_title = _("Search items");
+	        			break;
+	      			case "customer":
+	        			$link = $path_to_root . "/sales/inquiry/customers_list.php?popup=1&client_id=" . $id;
+	        			$img_title = _("Search customers");
+	        			break;
+	      			case "branch":
+	        			$link = $path_to_root . "/sales/inquiry/customer_branches_list.php?popup=1&client_id=" . $id . "#customer_id";
+	        			$img_title = _("Search branches");
+	        			break;
+	      			case "supplier":
+	        			$link = $path_to_root . "/purchasing/inquiry/suppliers_list.php?popup=1&client_id=" . $id;
+	        			$img_title = _("Search suppliers");
+	        			break;
+	      			case "account":
+	      			case "account2":
+	      				$skip = strtolower($type) == "account" ? false : true;
+	        			$link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&skip=".$skip."&client_id=" . $id;
+	        			$img_title = _("Search GL accounts");
+	        			break;
+	    		}
+	    	}
   		}
 
   		if ($link !=="") {
@@ -365,7 +367,7 @@ $opts = array(		// default options
 		$selector .= ' '.$opts['editlink'];
 
 	if ($search_box && $opts['cells'])
-		$str = ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector$img</td>";
+		$str = ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td nowrap>$selector$img</td>";
 	else
 		$str = $edit_entry.$selector.$img;
 	return $str;
@@ -944,7 +946,7 @@ function sales_items_list_cells($label, $name, $selected_id=null, $all_option=fa
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo sales_items_list($name, $selected_id, $all_option, $submit_on_change,
-		'', array('cells'=>true));
+		'', array('cells'=>true, 'max'=>50)); // maximum is set to 50 and not default 255.
 }
 
 function sales_kits_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
@@ -1343,7 +1345,7 @@ function sales_areas_list_row($label, $name, $selected_id=null, $special_option=
 
 function sales_groups_list($name, $selected_id=null, $special_option=false)
 {
-	$sql = "SELECT id, description, inactive FROM ".TB_PREF."groups";
+	$sql = "SELECT id, description, inactive FROM `".TB_PREF."groups`";
 	return combo_input($name, $selected_id, $sql, 'id', 'description', array(
 		'spec_option' => $special_option===true ? ' ' : $special_option,
 		'order' => 'description', 'spec_id' => 0,
@@ -1863,11 +1865,11 @@ function gl_all_accounts_list_cells($label, $name, $selected_id=null,
 }
 
 function gl_all_accounts_list_row($label, $name, $selected_id=null, 
-	$skip_bank_accounts=false, $cells=false, $all_option=false, $type_id=false)
+	$skip_bank_accounts=false, $cells=false, $all_option=false, $submit_on_change=false, $all=false, $type_id=false)
 {
 	echo "<tr><td class='label'>$label</td>";
 	gl_all_accounts_list_cells(null, $name, $selected_id, 
-		$skip_bank_accounts, $cells, $all_option, $type_id);
+		$skip_bank_accounts, $cells, $all_option, $submit_on_change, $all, $type_id);
 	echo "</tr>\n";
 }
 
@@ -2310,7 +2312,7 @@ function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_cha
 
 }
 
-function quick_entries_list_cells($label, $name, $selected_id=null, $type, $submit_on_change=false)
+function quick_entries_list_cells($label, $name, $selected_id, $type, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -2319,7 +2321,7 @@ function quick_entries_list_cells($label, $name, $selected_id=null, $type, $subm
 	echo "</td>";
 }
 
-function quick_entries_list_row($label, $name, $selected_id=null, $type, $submit_on_change=false)
+function quick_entries_list_row($label, $name, $selected_id, $type, $submit_on_change=false)
 {
 	echo "<tr><td class='label'>$label</td>";
 	quick_entries_list_cells(null, $name, $selected_id, $type, $submit_on_change);
@@ -2691,7 +2693,7 @@ function accounts_type_list_row($label, $name, $selected_id=null)
 function users_list_cells($label, $name, $selected_id=null, $submit_on_change=false, $spec_opt=true)
 {
     $where = false;
-	$sql = " SELECT user_id, IF(real_name = ' ', user_id, real_name) FROM ".TB_PREF."users";
+	$sql = " SELECT user_id, IF(real_name = '', user_id, real_name) FROM ".TB_PREF."users";
 
     if ($label != null)
         echo "<td>$label</td>\n";