X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_lists.inc;h=3c16809af728bca9a21dd621dc97cf80707cb5de;hb=9b413697aa4ca30f7f336dbf5fd04bf8caf2bc43;hp=afa50ee72b623308e82315b40586ee70c51c2395;hpb=3cf01ce4d0d2b31a0931e01b12a418f57b37d0f4;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index afa50ee7..3c16809a 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -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";
@@ -747,58 +748,13 @@ function sales_local_items_list_row($label, $name, $selected_id=null, $all_optio
 }
 //------------------------------------------------------------------------------------
 
-function base_stock_items_list($where, $name, $selected_id=null,
-	$all_option=false, $submit_on_change=false)
-{
-	global $all_items;
-
-	$sql = "SELECT stock_id, s.description, c.description
-		FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE
-		s.category_id=c.category_id";
-
-	return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
-	array(
-		'format' => '_format_stock_items',
-		'spec_option' => $all_option==true ?  _("All Items") : $all_option,
-		'spec_id' => $all_items,
-		'select_submit'=> $submit_on_change,
-		'where' => $where,
-		'category' => 2	) );
-}
-//------------------------------------------------------------------------------------
-
-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')",
-		$name, $selected_id, $all_option, $submit_on_change);
-}
-/*
-function stock_bom_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
-{
-	if ($label != null)
-		echo "<td>$label</td>\n";
-	echo "<td>";
-	$str = stock_bom_items_list($name, $selected_id, $all_option, $submit_on_change);
-	echo "</td>\n";
-	return $str;
-}
-
-function stock_bom_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
-{
-	echo "<tr>\n";
-	$str = stock_bom_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
-	echo "</tr>\n";
-	return $str;
-}
-*/
-//------------------------------------------------------------------------------------
-
 function stock_manufactured_items_list($name, $selected_id=null,
 	$all_option=false, $submit_on_change=false)
 {
-	return base_stock_items_list("s.mb_flag='M'",
-		$name, $selected_id, $all_option, $submit_on_change);
+	$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+		array('where'=>array("mb_flag= 'M'"), 
+			'edit_submit' => true));
+	return $str;		
 }
 
 function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
@@ -807,8 +763,7 @@ function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
-	$str = stock_manufactured_items_list($name, $selected_id, $all_option,
-				$submit_on_change);
+	$str = stock_manufactured_items_list($name, $selected_id, $all_option, $submit_on_change);
 	echo "</td>\n";
 	return $str;
 }
@@ -817,8 +772,7 @@ function stock_manufactured_items_list_row($label, $name, $selected_id=null,
 		$all_option=false, $submit_on_change=false)
 {
 	echo "<tr>\n";
-	$str = stock_manufactured_items_list_cells($label, $name, $selected_id,
-			$all_option, $submit_on_change);
+	$str = stock_manufactured_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
 	echo "</tr>\n";
 	return $str;
 }
@@ -926,10 +880,7 @@ function stock_units_list_row($label, $name, $value=null, $enabled=true)
 	while($unit = db_fetch($result))
 		$units[$unit['abbr']] = $unit['name'];
 
-	array_selector($name, $value, $units, 
-		array( 
-			'select_submit'=> true, 
-			'disabled' => !$enabled) );
+	array_selector($name, $value, $units, array( 'disabled' => !$enabled) );
 
 	echo "</td></tr>\n";
 }
@@ -1601,8 +1552,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 +1649,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 +2017,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