X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=f136c38229cccdced7113d1c99ee5d869689a716;hb=8c893a568ed275b1695b2f4df8cfda131a997a64;hp=0db2e10790523d27c117907a40ae7e6bbdb3cf4f;hpb=42c18d55006587f51057a4ff093233e557ee384e;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 0db2e107..f136c382 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -233,7 +233,7 @@ $opts = array(		// default options
 				$search_submit)."\n";
 		}
 	}
-	default_focus($name);
+	default_focus(($search_box && $by_id) ? $search_box : $name);
 	$str = $selector;
 	if ($search_box && $opts['cells'])
 		echo ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector</td>";
@@ -297,7 +297,7 @@ $opts = array(		// default options
 //if($name=='SelectStockFromList') display_error($sql);
 		foreach($items as $value=>$descr) {
 			$sel = '';
-			if ($selected_id == $value) {
+			if ((string)$selected_id === (string)$value) {
 				$sel = 'selected';
 				$found = $value;
 			}
@@ -318,8 +318,9 @@ $opts = array(		// default options
 	}
 
 	if ($found === false) {
-		$_POST[$name] = $first_id;
+		$selected_id = $first_id;
 	}
+	$_POST[$name] = $selected_id;
 
 	$aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
 	$selector = "<select $disabled name='$name' class='combo' title='"
@@ -602,7 +603,7 @@ $options = array(
 	'async' => false,
 	);
 
-	if ($showclosed)
+	if (!$showclosed)
 		$options['where'][] = "closed=0";
 	if($showtype)
 		$options['where'][] = "type_=$showtype";
@@ -770,7 +771,7 @@ function base_stock_items_list($where, $name, $selected_id=null,
 function stock_bom_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
 {
 
-	return base_stock_items_list("(s.mb_flag='M' OR s.mb_flag='K')",
+	return base_stock_items_list("s.mb_flag='M'",
 		$name, $selected_id, $all_option, $submit_on_change);
 }
 /*
@@ -1601,8 +1602,8 @@ function gl_all_accounts_list_row($label, $name, $selected_id=null,
 function yesno_list($name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false)
 {
 	$items = array();
-	$items['1'] = strlen($name_yes) ? $name_yes : _("Yes");
 	$items['0'] = strlen($name_no) ? $name_no : _("No");
+	$items['1'] = strlen($name_yes) ? $name_yes : _("Yes");
 
 	return array_selector($name, $selected_id, $items, 
 		array( 
@@ -1698,7 +1699,8 @@ function payment_person_types_list($name, $selected_id=null, $submit_on_change=f
 	{
 		if (payment_person_types::has_items($type['id']))
 		{
-			$items[$type['id']] = $type['name'];
+			if ($type['id'] != payment_person_types::WorkOrder())
+				$items[$type['id']] = $type['name'];
 		}
 	}
 	
@@ -2065,4 +2067,17 @@ function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on
 }
 
 
+function class_types_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+	global $class_types;
+	
+	echo "<tr><td>$label</td><td>";
+	array_selector($name, $selected_id, $class_types, 
+		array( 
+			'select_submit'=> $submit_on_change
+		) );
+	echo "</td></tr>\n";
+}
+
+
 ?>
\ No newline at end of file