X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=86968c9fbe644a6c13336ae6dc7a082fb5902af2;hb=ef2f5f6ff03591f558e3296864bbb8b5cbb1b65d;hp=1176cc5f8d538dff76d8e7a721a21c729c6080af;hpb=626d9d05ac7d4a839fedd391c0dbf9919df30470;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 1176cc5f..86968c9f 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -5,16 +5,16 @@ include_once($path_to_root . "/includes/reserved.inc");
 include_once($path_to_root . "/includes/types.inc");
 include_once($path_to_root . "/includes/current_user.inc");
 
-$_search_button = "<input type='submit' class='combo_submit' style='border:0;background:url($path_to_root/themes/"
-	."%s/images/locate.png) no-repeat;%s' name='%s' value=' ' title='"._("Set filter")."'> ";
+$_search_button = "<input %s type='submit' class='combo_submit' style='border:0;background:url($path_to_root/themes/"
+	."%s/images/locate.png) no-repeat;%s' aspect='fallback' name='%s' value=' ' title='"._("Set filter")."'> ";
 
-$_select_button = "<input type='submit' class='combo_select' style='border:0;background:url($path_to_root/themes/"
-	."%s/images/button_ok.png) no-repeat;%s' name='%s' value=' ' title='"._("Select")."'> ";
+$_select_button = "<input %s type='submit' class='combo_select' style='border:0;background:url($path_to_root/themes/"
+	."%s/images/button_ok.png) no-repeat;%s' aspect='fallback' name='%s' value=' ' title='"._("Select")."'> ";
 
 $all_items = reserved_words::get_all();
 
 //----------------------------------------------------------------------------
-//	Universal combo generator
+//	Universal sql combo generator
 //	$sql must return selector values and selector texts in columns 0 & 1
 //	Options are merged with defaults.
 
@@ -30,6 +30,7 @@ $opts = array(		// default options
 	'spec_option'=>false, 	// option text or false
 	'spec_id' => 0,		// option id
 		// submit on select parameters
+	'default' => '', // default value when $_POST is not set
 	'select_submit' => false, //submit on select: true/false
 	'async' => true,	// select update via ajax (true) vs _page_body reload
 		// search box parameters
@@ -46,11 +47,12 @@ $opts = array(		// default options
 	'cells' => false,	// combo displayed as 2 <td></td> cells
 	'search' => array(), // sql field names to search
 	'format' => null, 	 // format functions for regular options
-	'disabled' => false, // FIX todo
+	'disabled' => false,
 	'box_hint' => null // box/selectors hints; null = std see below
 );
 // ------ merge options with defaults ----------
-	$opts = array_merge($opts, $options);
+	if($options != null)
+		$opts = array_merge($opts, $options);
 	if (!is_array($opts['where']))  $opts['where'] = array($opts['where']);
 
 	$search_box = $opts['search_box']===true ? '_'.$name.'_edit' : $opts['search_box'];
@@ -60,21 +62,22 @@ $opts = array(		// default options
 	$spec_option = $opts['spec_option'];
 	$by_id = ($opts['type'] == 0);
 	$class = $by_id ? 'combo':'combo2';
+	$disabled = $opts['disabled'] ? "disabled" : '';
 
 	if(!count($opts['search'])) {
 		$opts['search'] = array($by_id ? $valfield : $namefield);
 	}
 	if ($opts['sel_hint'] === null)
 		$opts['sel_hint'] = $by_id || $search_box==false ?
-		'' : _('Press Space tab for search pattern entry');
+			'' : _('Press Space tab for search pattern entry');
 
 	if ($opts['box_hint'] === null)
-		$opts['box_hint'] = $search_box ?
+		$opts['box_hint'] = $search_box && $search_submit != false ?
 			($by_id ? _('Enter code fragment to search or * for all')
 			: _('Enter description fragment to search or * for all')) :'';
 
 	if ($selected_id == null) {
-		$selected_id = get_post($name, null);
+		$selected_id = get_post($name, $opts['default']);
 	}
 	$txt = get_post($search_box);
 	$rel = '';
@@ -148,6 +151,7 @@ $opts = array(		// default options
 		}
 		db_free_result($result);
 	}
+
 	// Prepend special option.
 	if ($spec_option !== false) { // if special option used - add it
 		$first_id = $spec_id;
@@ -158,16 +162,15 @@ $opts = array(		// default options
 	}
 
 	if ($found === false) {
-		$_POST[$name] = $first_id;
+		$selected_id = $first_id;
 	}
+	$_POST[$name] = $selected_id;
 
-	if ($by_id) {
+	if ($by_id && $search_box != false) {
 		$txt = $_POST[$name];
-		if ($search_box)
-			$Ajax->addUpdate($name, $search_box, $txt);
+		$Ajax->addUpdate($name, $search_box, $txt);
 	}
-
-	$selector = "<select name='$name' class='$class' title='"
+	$selector = "<select $disabled name='$name' class='$class' title='"
 		. $opts['sel_hint']."' $rel>".$selector."</select>\n";
 
 	$Ajax->addUpdate($name, "_{$name}_sel", $selector);
@@ -179,7 +182,7 @@ $opts = array(		// default options
 	if ($select_submit != false) { // if submit on change is used - add select button
 		global $_select_button;
 	// button class selects form reload/ajax selector update
-		$selector .= sprintf($_select_button, user_theme(),
+		$selector .= sprintf($_select_button, $disabled, user_theme(),
 			(in_ajax() ? 'display:none;':''),
 			$select_submit)."\n";
 	}
@@ -187,7 +190,7 @@ $opts = array(		// default options
 
 	$edit_entry = '';
 	if ($search_box != false) {
-		$edit_entry = "<input type='text' name='$search_box' id='$search_box' size='".
+		$edit_entry = "<input $disabled type='text' name='$search_box' id='$search_box' size='".
 			$opts['size']."' maxlength='".$opts['max'].
 			"' value='$txt' class='$class' rel='$name' autocomplete='off' title='"
 			.$opts['box_hint']."'"
@@ -195,7 +198,7 @@ $opts = array(		// default options
 			.">\n";
 		if ($search_submit != false) {
 			global $_search_button;
-			$edit_entry .= sprintf($_search_button, user_theme(),
+			$edit_entry .= sprintf($_search_button, $disabled, user_theme(),
 				(in_ajax() ? 'display:none;':''),
 				$search_submit)."\n";
 		}
@@ -209,8 +212,108 @@ $opts = array(		// default options
 
 	return $str;
 }
+//----------------------------------------------------------------------------------------------
+//	Universal array combo generator
+//	$items is array of options 'value' => 'description'
+//	Options is reduced set of combo_selector options and is merged with defaults.
+
+function array_selector($name, $selected_id, $items, $options=null)
+{
+	global $Ajax;
+
+$opts = array(		// default options
+	'spec_option'=>false, 	// option text or false
+	'spec_id' => 0,		// option id
+	'select_submit' => false, //submit on select: true/false
+	'async' => true,	// select update via ajax (true) vs _page_body reload
+	'default' => '', // default value when $_POST is not set
+		// search box parameters
+	'sel_hint' => null,
+	'disabled' => false
+);
+// ------ merge options with defaults ----------
+	if($options != null)
+		$opts = array_merge($opts, $options);
+	$select_submit =  $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit'];
+	$spec_id = $opts['spec_id'];
+	$spec_option = $opts['spec_option'];
+	$disabled = $opts['disabled'] ? "disabled" : '';
+
+	if ($selected_id == null) {
+		$selected_id = get_post($name, $opts['default']);
+	}
+
+	if (isset($_POST[$select_submit])) {
+		if (!$opts['async'])
+			$Ajax->activate('_page_body');
+		else
+			$Ajax->activate($name);
+	}
+
+	// ------ make selector ----------
+	$selector = $first_opt = '';
+	$first_id = false;
+	$found = false;
+//if($name=='SelectStockFromList') display_error($sql);
+		foreach($items as $value=>$descr) {
+			$sel = '';
+			if ($selected_id == $value) {
+				$sel = 'selected';
+				$found = $value;
+			}
+			if ($first_id === false) {
+				$first_id = $value;
+				$first_opt = $descr;
+			}
+			$selector .= "<option $sel value='$value'>$descr</option>\n";
+		}
+
+	// Prepend special option.
+	if ($spec_option !== false) { // if special option used - add it
+		$first_id = $spec_id;
+		$first_opt = $spec_option;
+		$sel = $found===false ? 'selected' : '';
+		$selector = "<option $sel value='$spec_id'>$spec_option</option>\n"
+			. $selector;
+	}
+
+	if ($found === false) {
+		$_POST[$name] = $first_id;
+	}
+
+	$selector = "<select $disabled name='$name' class='combo' title='"
+		. $opts['sel_hint']."' >".$selector."</select>\n";
+
+	$Ajax->addUpdate($name, "_{$name}_sel", $selector);
+
+	$selector = "<span id='_{$name}_sel'>".$selector."</span>\n";
+
+	if ($select_submit != false) { // if submit on change is used - add select button
+		global $_select_button;
+		$selector .= sprintf($_select_button, $disabled, user_theme(),
+			(in_ajax() ? 'display:none;':''),
+			$select_submit)."\n";
+	}
+	default_focus($name);
+	echo $selector;
+
+	return $selector;
+}
+//----------------------------------------------------------------------------------------------
+
+function _format_add_curr($row)
+{
+	static $company_currency;
+
+	if ($company_currency == null)
+	{
+		$company_currency = get_company_currency();
+	}
+	return $row[1] . ($row[2] == $company_currency ?
+		'' : ("&nbsp;-&nbsp;" . $row[2]));
+}
 
-function supplier_list($name, $selected_id, $spec_option=false, $submit_on_change=false)
+function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false)
 {
 	global $all_items;
 
@@ -232,19 +335,7 @@ function supplier_list($name, $selected_id, $spec_option=false, $submit_on_chang
 		));
 }
 
-function _format_add_curr($row)
-{
-static $company_currency;
-
-if ($company_currency == null)
-{
-	$company_currency = get_company_currency();
-}
-return $row[1] . ($row[2] == $company_currency ?
-	'' : ("&nbsp;-&nbsp;" . $row[2]));
-}
-
-function supplier_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td><td>\n";
@@ -253,7 +344,7 @@ function supplier_list_cells($label, $name, $selected_id, $all_option=false, $su
 	return $str;
 }
 
-function supplier_list_row($label, $name, $selected_id, $all_option = false, $submit_on_change=false)
+function supplier_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false)
 {
 echo "<tr><td>$label</td><td>";
 	$str = supplier_list($name, $selected_id, $all_option, $submit_on_change );
@@ -262,7 +353,7 @@ return $str;
 }
 //----------------------------------------------------------------------------------------------
 
-function customer_list($name, $selected_id, $spec_option=false, $submit_on_change=false)
+function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false)
 {
 	global $all_items;
 
@@ -285,7 +376,7 @@ return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
 	) );
 }
 
-function customer_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function customer_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -295,17 +386,17 @@ function customer_list_cells($label, $name, $selected_id, $all_option=false, $su
 	return $str;
 }
 
-function customer_list_row($label, $name, $selected_id, $all_option = false, $submit_on_change=false)
+function customer_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false)
 {
-echo "<tr><td>$label</td><td nowrap>";
-$str = customer_list($name, $selected_id, $all_option, $submit_on_change);
-echo "</td>\n</tr>\n";
-return $str;
+	echo "<tr><td>$label</td><td nowrap>";
+	$str = customer_list($name, $selected_id, $all_option, $submit_on_change);
+	echo "</td>\n</tr>\n";
+	return $str;
 }
 
 //------------------------------------------------------------------------------------------------
 
-function customer_branches_list($customer_id, $name, $selected_id,
+function customer_branches_list($customer_id, $name, $selected_id=null,
 	$spec_option = true, $enabled=true, $submit_on_change=false)
 {
 	global $all_items;
@@ -321,12 +412,11 @@ return  combo_input($name, $selected_id, $sql, 'branch_code', 'br_name',
 		'spec_id' => $all_items,
 		'select_submit'=> $submit_on_change,
 		'sel_hint' => _('Select customer branch')
-//		  'async' => false
 	) );
 }
 //------------------------------------------------------------------------------------------------
 
-function customer_branches_list_cells($label,$customer_id, $name, $selected_id, $all_option = true, $enabled=true, $submit_on_change=false)
+function customer_branches_list_cells($label,$customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -336,7 +426,7 @@ function customer_branches_list_cells($label,$customer_id, $name, $selected_id,
 	return $ret;
 }
 
-function customer_branches_list_row($label,$customer_id, $name, $selected_id, $all_option = true, $enabled=true, $submit_on_change=false)
+function customer_branches_list_row($label,$customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false)
 {
 	echo "<tr>";
 	$ret = customer_branches_list_cells($label, $customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
@@ -346,7 +436,7 @@ function customer_branches_list_row($label,$customer_id, $name, $selected_id, $a
 
 //------------------------------------------------------------------------------------------------
 
-function locations_list($name, $selected_id, $all_option=false, $submit_on_change=false)
+function locations_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
 {
 	global $all_items;
 
@@ -360,7 +450,7 @@ return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name',
 	) );
 }
 
-function locations_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function locations_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -370,7 +460,7 @@ function locations_list_cells($label, $name, $selected_id, $all_option=false, $s
 	return $str;
 }
 
-function locations_list_row($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function locations_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
 {
 	echo "<tr>";
 	$str = locations_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
@@ -380,59 +470,51 @@ function locations_list_row($label, $name, $selected_id, $all_option=false, $sub
 
 //-----------------------------------------------------------------------------------------------
 
-function currencies_list($name, $selected_id, $submit_on_change=false)
+function currencies_list($name, $selected_id=null, $submit_on_change=false)
 {
 	$sql = "SELECT curr_abrev, currency FROM ".TB_PREF."currencies";
 
 // default to the company currency
-	if ($selected_id == "")
-	{
-			$selected_id = get_company_currency();
-			$_POST[$name] = $selected_id;
-	}
 
 return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency',
 	array(
 		'select_submit'=> $submit_on_change,
-		'async' => false
+		'default' => get_company_currency(),
+		'async' => false		
 	) );
 }
 
-function currencies_list_cells($label, $name, $selected_id)
+function currencies_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
-	$str = currencies_list($name, $selected_id);
+	$str = currencies_list($name, $selected_id, $submit_on_change);
 	echo "</td>\n";
 	return $str;
 }
 
-function currencies_list_row($label, $name, $selected_id)
+function currencies_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
 	echo "<tr>\n";
-	$str = currencies_list_cells($label, $name, $selected_id);
+	$str = currencies_list_cells($label, $name, $selected_id, $submit_on_change);
 	echo "</tr>\n";
 	return $str;
 }
 
 //---------------------------------------------------------------------------------------------------
 
-function fiscalyears_list($name, $selected_id, $submit_on_change=false)
+function fiscalyears_list($name, $selected_id=null, $submit_on_change=false)
 {
 
 	$sql = "SELECT * FROM ".TB_PREF."fiscal_year";
 
 // default to the company current fiscal year
-	if ($selected_id == "")
-	{
-			$selected_id = get_company_pref('f_year');
-			$_POST[$name] = $selected_id;
-	}
 
 return combo_input($name, $selected_id, $sql, 'id', '',
 	array(
 		'order' => 'begin',
+		'default' => get_company_pref('f_year'),
 		'format' => '_format_fiscalyears',
 		'select_submit'=> $submit_on_change,
 		'async' => false
@@ -445,7 +527,7 @@ function _format_fiscalyears($row)
 	. "&nbsp;&nbsp;" . ($row[3] ? _('Closed') : _('Active')) . "</option>\n";
 }
 
-function fiscalyears_list_cells($label, $name, $selected_id)
+function fiscalyears_list_cells($label, $name, $selected_id=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -455,7 +537,7 @@ function fiscalyears_list_cells($label, $name, $selected_id)
 	return $str;
 }
 
-function fiscalyears_list_row($label, $name, $selected_id)
+function fiscalyears_list_row($label, $name, $selected_id=null)
 {
 	echo "<tr>\n";
 	$str = fiscalyears_list_cells($label, $name, $selected_id);
@@ -464,7 +546,7 @@ function fiscalyears_list_row($label, $name, $selected_id)
 }
 //------------------------------------------------------------------------------------
 
-function dimensions_list($name, $selected_id, $no_option=false, $showname=' ',
+function dimensions_list($name, $selected_id=null, $no_option=false, $showname=' ',
 	$submit_on_change=false, $showclosed=false, $showtype=1)
 {
 $sql = "SELECT id, CONCAT(reference,'  ',name) as ref FROM ".TB_PREF."dimensions";
@@ -478,14 +560,14 @@ $options = array(
 	);
 
 	if ($showclosed)
-	$options['where'][] = "closed=0";
+		$options['where'][] = "closed=0";
 	if($showtype)
-	$options['where'][] = "type_=$showtype";
+		$options['where'][] = "type_=$showtype";
 
 	return combo_input($name, $selected_id, $sql, 'id', 'ref', $options);
 }
 
-function dimensions_list_cells($label, $name, $selected_id, $no_option=false, $showname=null,
+function dimensions_list_cells($label, $name, $selected_id=null, $no_option=false, $showname=null,
 	$showclosed=false, $showtype=0)
 {
 	if ($label != null)
@@ -496,7 +578,7 @@ function dimensions_list_cells($label, $name, $selected_id, $no_option=false, $s
 	return $str;
 }
 
-function dimensions_list_row($label, $name, $selected_id, $no_option=false, $showname=null,
+function dimensions_list_row($label, $name, $selected_id=null, $no_option=false, $showname=null,
 	$showclosed=false, $showtype=0)
 {
 	echo "<tr>\n";
@@ -508,7 +590,7 @@ function dimensions_list_row($label, $name, $selected_id, $no_option=false, $sho
 
 //---------------------------------------------------------------------------------------------------
 
-function stock_items_list($name, $selected_id, $all_option=false, $submit_on_change=false, $opts=array())
+function stock_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false, $opts=array())
 {
 	global $all_items;
 
@@ -535,16 +617,16 @@ function _format_stock_items($row)
 		. $row[2] . "&nbsp;-&nbsp;" . $row[1];
 }
 
-function stock_items_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-	array('cells'=>true));
+		array('cells'=>true));
 	return $str;
 }
 /*
-function stock_items_list_row($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function stock_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
 {
 	echo "<tr>\n";
 	$str = stock_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
@@ -554,7 +636,7 @@ function stock_items_list_row($label, $name, $selected_id, $all_option=false, $s
 */
 //------------------------------------------------------------------------------------
 
-function base_stock_items_list($where, $name, $selected_id,
+function base_stock_items_list($where, $name, $selected_id=null,
 	$all_option=false, $submit_on_change=false)
 {
 	global $all_items;
@@ -574,14 +656,14 @@ function base_stock_items_list($where, $name, $selected_id,
 }
 //------------------------------------------------------------------------------------
 
-function stock_bom_items_list($name, $selected_id, $all_option=false, $submit_on_change=false)
+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, $all_option=false, $submit_on_change=false)
+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";
@@ -591,7 +673,7 @@ function stock_bom_items_list_cells($label, $name, $selected_id, $all_option=fal
 	return $str;
 }
 
-function stock_bom_items_list_row($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+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);
@@ -601,14 +683,14 @@ function stock_bom_items_list_row($label, $name, $selected_id, $all_option=false
 */
 //------------------------------------------------------------------------------------
 
-function stock_manufactured_items_list($name, $selected_id,
+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);
 }
 
-function stock_manufactured_items_list_cells($label, $name, $selected_id,
+function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
 				$all_option=false, $submit_on_change=false)
 {
 	if ($label != null)
@@ -620,7 +702,7 @@ function stock_manufactured_items_list_cells($label, $name, $selected_id,
 	return $str;
 }
 
-function stock_manufactured_items_list_row($label, $name, $selected_id,
+function stock_manufactured_items_list_row($label, $name, $selected_id=null,
 		$all_option=false, $submit_on_change=false)
 {
 	echo "<tr>\n";
@@ -631,60 +713,67 @@ function stock_manufactured_items_list_row($label, $name, $selected_id,
 }
 //------------------------------------------------------------------------------------
 
-function stock_component_items_list($name, $parent_stock_id, $selected_id,
+function stock_component_items_list($name, $parent_stock_id, $selected_id=null,
 	$all_option=false, $submit_on_change=false)
 {
-	return base_stock_items_list("stock_id != '$parent_stock_id'", $name, $selected_id,
-		$all_option, $submit_on_change);
+	$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+		array('where'=>array("stock_id != '$parent_stock_id'")));
+	return $str;
+}
+
+function stock_component_items_list_cells($label, $name, $parent_stock_id, 
+	$selected_id=null, $all_option=false, $submit_on_change=false)
+{
+	if ($label != null)
+		echo "<td>$label</td>\n";
+	$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+		array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true));
+	return $str;
 }
 //------------------------------------------------------------------------------------
 
-function stock_costable_items_list($name, $selected_id,
+function stock_costable_items_list($name, $selected_id=null,
 	$all_option=false, $submit_on_change=false)
 {
-	return base_stock_items_list("mb_flag!='D'", $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!='D'")));
+	return $str;
 }
 
-//------------------------------------------------------------------------------------
-
-function stock_purchasable_items_list($name, $selected_id,	$all_option=false,
-		$submit_on_change=false, $opts=array())
+function stock_costable_items_list_cells($label, $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
-				AND mb_flag !='M' ";
-	return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
-	  array_merge( array(
-		'format' => '_format_stock_items',
-		'spec_option' => $all_option===true ?  _("All Items") : $all_option,
-		'spec_id' => $all_items,
-		'search_box' => true,
-		'search' => array("stock_id", "c.description","s.description"),
-		'search_submit' => get_company_pref('no_item_list')!=0,
-		'size'=>10,
-		'select_submit'=> $submit_on_change
-	  ), $opts) );
+	if ($label != null)
+		echo "<td>$label</td>\n";
+	$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+		array('where'=>array("mb_flag!='D'"), 'cells'=>true));
+	return $str;
+}
 
+//------------------------------------------------------------------------------------
+function stock_purchasable_items_list($name, $selected_id=null,	
+	$all_option=false, $submit_on_change=false)
+{
+	$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+		array('where'=>array("mb_flag!= 'M'")));
+	return $str;
 }
 
-function stock_purchasable_items_list_cells($label, $name, $selected_id,
+function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
 			$all_option=false, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
-	$ret = stock_purchasable_items_list($name, $selected_id, $all_option,
-		$submit_on_change, array('cells'=>true) );
-	return $ret;
+	$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+		array('where'=>array("mb_flag!= 'M'"), 'cells'=>true));
+	return $str;
 }
 
-function stock_purchasable_items_list_row($label, $name, $selected_id,
+function stock_purchasable_items_list_row($label, $name, $selected_id=null,
 			$all_option=false, $submit_on_change=false)
 {
 	echo "<tr>\n";
-	$ret = stock_purchasable_items_list_cells($label, $name, $selected_id,
+	$ret = stock_purchasable_items_list_cells($label, $name, $selected_id=null,
 		$all_option, $submit_on_change);
 	echo "</tr>\n";
 	return $ret;
@@ -692,79 +781,61 @@ function stock_purchasable_items_list_row($label, $name, $selected_id,
 
 //------------------------------------------------------------------------------------
 
-function stock_item_types_list_row($label, $name, $selected_id, $enabled=true)
+function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=true)
 {
-	default_focus($name);
+	$types = array(
+		'M' => _("Manufactured"),
+		'B' => _("Purchased"),
+		'D' => _("Service")
+	);
+
 	echo "<tr>";
-	if ($label != NULL)
+	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
-	if ($enabled)
-		$sel = "<select name='$name' onchange='JsHttpRequest.request(\"_{$name}_update\", this.form);'>\n";
-		
-	else
-		$sel =  "<select disabled name='$name'>\n";
-	if ($selected_id == null)
-		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	if ($selected_id == "")
-		$_POST[$name] = $selected_id = "B";
-	$sel .= "<option " . ($selected_id == 'M'?" selected ":"") . " value='M'>" . _("Manufactured"). "</option>\n";
-	$sel .= "<option " . ($selected_id == 'B'?" selected ":"") . " value='B'>" . _("Purchased"). "</option>\n";
-	$sel .= "<option " . ($selected_id == 'D'?" selected ":"") . " value='D'>" . _("Service"). "</option>\n";
-	$sel .= "</select>";
-	echo $sel;
+
+	array_selector($name, $selected_id, $types, 
+		array( 
+			'select_submit'=> true, 
+			'disabled' => !$enabled) );
 	echo "</td></tr>\n";
-	return $sel;
 }
 
-function stock_units_list_row($label, $name, $value, $enabled=true)
+function stock_units_list_row($label, $name, $value=null, $enabled=true)
 {
-	default_focus($name);
 	$result = get_all_item_units();
-	echo "<tr><td>$label</td>\n";
-	if ($enabled)
-		echo "<td><select name='$name'>";
-	else
-		echo "<td><select disabled name='$name'>";
-
-	if ($value == null)
-		$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
+	echo "<tr>";
+	if ($label != null)
+		echo "<td>$label</td>\n";
+	echo "<td>";
 
 	while($unit = db_fetch($result))
-	{
-		if ($value == "")
-		{
-			$_POST[$name] = $unit['abbr'];
-		}
-		$descr = $unit['name'];
-		if ($value==$unit['abbr'])
-		{
-			echo "<option selected value='".$unit['abbr']."'>$descr</option>\n";
-		}
-		else
-		{
-			echo "<option value='".$unit['abbr']."'>$descr</option>\n";
-		}
-	}
-	echo "</select></td></tr>\n";
+		$units[$unit['abbr']] = $unit['name'];
+
+	array_selector($name, $value, $units, 
+		array( 
+			'select_submit'=> true, 
+			'disabled' => !$enabled) );
+
+	echo "</td></tr>\n";
 }
 
 //------------------------------------------------------------------------------------
 
-function tax_types_list($name, $selected_id, $none_option=false, $submit_on_change=false)
+function tax_types_list($name, $selected_id=null, $none_option=false, $submit_on_change=false)
 {
 	$sql = "SELECT id, CONCAT(name, ' (',rate,'%)') as name FROM ".TB_PREF."tax_types";
 
 	return combo_input($name, $selected_id, $sql, 'id', 'name',
 	array(
 		'spec_option' => $none_option,
-		'spec_id' => 0,
+		'spec_id' => reserved_words::get_all_numeric(),
 		'select_submit'=> $submit_on_change,
 		'async' => false,
 	) );
 }
 
-function tax_types_list_cells($label, $name, $selected_id, $none_option=false,
+function tax_types_list_cells($label, $name, $selected_id=null, $none_option=false,
 	$submit_on_change=false)
 {
 	if ($label != null)
@@ -775,7 +846,7 @@ function tax_types_list_cells($label, $name, $selected_id, $none_option=false,
 	return $str;
 }
 
-function tax_types_list_row($label, $name, $selected_id, $none_option=false,
+function tax_types_list_row($label, $name, $selected_id=null, $none_option=false,
 	$submit_on_change=false)
 {
 	echo "<tr>\n";
@@ -786,7 +857,7 @@ function tax_types_list_row($label, $name, $selected_id, $none_option=false,
 
 //------------------------------------------------------------------------------------
 
-function tax_groups_list($name, $selected_id,
+function tax_groups_list($name, $selected_id=null,
 	$none_option=false, $submit_on_change=false)
 {
 	$sql = "SELECT id, name FROM ".TB_PREF."tax_groups";
@@ -801,7 +872,7 @@ function tax_groups_list($name, $selected_id,
 	) );
 }
 
-function tax_groups_list_cells($label, $name, $selected_id, $submit_on_change=false)
+function tax_groups_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -811,7 +882,7 @@ function tax_groups_list_cells($label, $name, $selected_id, $submit_on_change=fa
 	return $str;
 }
 
-function tax_groups_list_row($label, $name, $selected_id, $submit_on_change=false)
+function tax_groups_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
 	echo "<tr>\n";
 	$str = tax_groups_list_cells($label, $name, $selected_id, false, $submit_on_change);
@@ -821,13 +892,13 @@ function tax_groups_list_row($label, $name, $selected_id, $submit_on_change=fals
 
 //------------------------------------------------------------------------------------
 
-function item_tax_types_list($name, $selected_id)
+function item_tax_types_list($name, $selected_id=null)
 {
 	$sql ="SELECT id, name FROM ".TB_PREF."item_tax_types";
 	combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') );
 }
 
-function item_tax_types_list_cells($label, $name, $selected_id)
+function item_tax_types_list_cells($label, $name, $selected_id=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -836,7 +907,7 @@ function item_tax_types_list_cells($label, $name, $selected_id)
 	echo "</td>\n";
 }
 
-function item_tax_types_list_row($label, $name, $selected_id)
+function item_tax_types_list_row($label, $name, $selected_id=null)
 {
 	echo "<tr>\n";
 	item_tax_types_list_cells($label, $name, $selected_id);
@@ -845,13 +916,13 @@ function item_tax_types_list_row($label, $name, $selected_id)
 
 //------------------------------------------------------------------------------------
 
-function shippers_list($name, $selected_id)
+function shippers_list($name, $selected_id=null)
 {
 	$sql = "SELECT shipper_id, shipper_name FROM ".TB_PREF."shippers";
 	combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', array());
 }
 
-function shippers_list_cells($label, $name, $selected_id)
+function shippers_list_cells($label, $name, $selected_id=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -860,7 +931,7 @@ function shippers_list_cells($label, $name, $selected_id)
 	echo "</td>\n";
 }
 
-function shippers_list_row($label, $name, $selected_id)
+function shippers_list_row($label, $name, $selected_id=null)
 {
 	echo "<tr>\n";
 	shippers_list_cells($label, $name, $selected_id);
@@ -869,13 +940,13 @@ function shippers_list_row($label, $name, $selected_id)
 
 //-------------------------------------------------------------------------------------
 
-function sales_persons_list($name, $selected_id)
+function sales_persons_list($name, $selected_id=null)
 {
 	$sql = "SELECT salesman_code, salesman_name FROM ".TB_PREF."salesman";
 	combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', array());
 }
 
-function sales_persons_list_cells($label, $name, $selected_id)
+function sales_persons_list_cells($label, $name, $selected_id=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -884,7 +955,7 @@ function sales_persons_list_cells($label, $name, $selected_id)
 	echo "</td>\n";
 }
 
-function sales_persons_list_row($label, $name, $selected_id, $submit_on_change=false)
+function sales_persons_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
 	echo "<tr>\n";
 	sales_persons_list_cells($label, $name, $selected_id, $submit_on_change=false);
@@ -893,13 +964,13 @@ function sales_persons_list_row($label, $name, $selected_id, $submit_on_change=f
 
 //------------------------------------------------------------------------------------
 
-function sales_areas_list($name, $selected_id)
+function sales_areas_list($name, $selected_id=null)
 {
 	$sql = "SELECT area_code, description FROM ".TB_PREF."areas";
 	combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
 }
 
-function sales_areas_list_cells($label, $name, $selected_id)
+function sales_areas_list_cells($label, $name, $selected_id=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -908,7 +979,7 @@ function sales_areas_list_cells($label, $name, $selected_id)
 	echo "</td>\n";
 }
 
-function sales_areas_list_row($label, $name, $selected_id)
+function sales_areas_list_row($label, $name, $selected_id=null)
 {
 	echo "<tr>\n";
 	sales_areas_list_cells($label, $name, $selected_id);
@@ -917,13 +988,13 @@ function sales_areas_list_row($label, $name, $selected_id)
 
 //------------------------------------------------------------------------------------
 
-function workorders_list($name, $selected_id)
+function workorders_list($name, $selected_id=null)
 {
 	$sql = "SELECT id, wo_ref FROM ".TB_PREF."workorders WHERE closed=0";
 	combo_input($name, $selected_id, $sql, 'id', 'wo_ref', array());
 }
 
-function workorders_list_cells($label, $name, $selected_id)
+function workorders_list_cells($label, $name, $selected_id=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -932,7 +1003,7 @@ function workorders_list_cells($label, $name, $selected_id)
 	echo "</td>\n";
 }
 
-function workorders_list_row($label, $name, $selected_id)
+function workorders_list_row($label, $name, $selected_id=null)
 {
 	echo "<tr>\n";
 	workorders_list_cells($label, $name, $selected_id);
@@ -941,13 +1012,13 @@ function workorders_list_row($label, $name, $selected_id)
 
 //------------------------------------------------------------------------------------
 
-function payment_terms_list($name, $selected_id)
+function payment_terms_list($name, $selected_id=null)
 {
 	$sql = "SELECT terms_indicator, terms FROM ".TB_PREF."payment_terms";
 	combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array());
 }
 
-function payment_terms_list_cells($label, $name, $selected_id)
+function payment_terms_list_cells($label, $name, $selected_id=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -956,7 +1027,7 @@ function payment_terms_list_cells($label, $name, $selected_id)
 	echo "</td>\n";
 }
 
-function payment_terms_list_row($label, $name, $selected_id)
+function payment_terms_list_row($label, $name, $selected_id=null)
 {
 	echo "<tr>\n";
 	payment_terms_list_cells($label, $name, $selected_id);
@@ -965,13 +1036,13 @@ function payment_terms_list_row($label, $name, $selected_id)
 
 //------------------------------------------------------------------------------------
 
-function credit_status_list($name, $selected_id)
+function credit_status_list($name, $selected_id=null)
 {
 	$sql ="SELECT id, reason_description FROM ".TB_PREF."credit_status";
 	combo_input($name, $selected_id, $sql, 'id', 'reason_description', array());
 }
 
-function credit_status_list_cells($label, $name, $selected_id)
+function credit_status_list_cells($label, $name, $selected_id=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -980,7 +1051,7 @@ function credit_status_list_cells($label, $name, $selected_id)
 	echo "</td>\n";
 }
 
-function credit_status_list_row($label, $name, $selected_id)
+function credit_status_list_row($label, $name, $selected_id=null)
 {
 	echo "<tr>\n";
 	credit_status_list_cells($label, $name, $selected_id);
@@ -989,7 +1060,7 @@ function credit_status_list_row($label, $name, $selected_id)
 
 //-----------------------------------------------------------------------------------------------
 
-function sales_types_list($name, $selected_id, $submit_on_change=false, $special_option=false)
+function sales_types_list($name, $selected_id=null, $submit_on_change=false, $special_option=false)
 {
 	$sql = "SELECT id, sales_type FROM ".TB_PREF."sales_types";
 
@@ -1002,7 +1073,7 @@ function sales_types_list($name, $selected_id, $submit_on_change=false, $special
 	) );
 }
 
-function sales_types_list_cells($label, $name, $selected_id, $submit_on_change=false, $special_option=false)
+function sales_types_list_cells($label, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -1012,7 +1083,7 @@ function sales_types_list_cells($label, $name, $selected_id, $submit_on_change=f
 	return $str;
 }
 
-function sales_types_list_row($label, $name, $selected_id, $submit_on_change=false, $special_option=false)
+function sales_types_list_row($label, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
 {
 	echo "<tr>\n";
 	$str = sales_types_list_cells($label, $name, $selected_id, $submit_on_change, $special_option);
@@ -1022,13 +1093,13 @@ function sales_types_list_row($label, $name, $selected_id, $submit_on_change=fal
 
 //-----------------------------------------------------------------------------------------------
 
-function movement_types_list($name, $selected_id)
+function movement_types_list($name, $selected_id=null)
 {
 	$sql = "SELECT id, name FROM ".TB_PREF."movement_types";
 	combo_input($name, $selected_id, $sql, 'id', 'name', array());
 }
 
-function movement_types_list_cells($label, $name, $selected_id)
+function movement_types_list_cells($label, $name, $selected_id=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -1037,7 +1108,7 @@ function movement_types_list_cells($label, $name, $selected_id)
 	echo "</td>\n";
 }
 
-function movement_types_list_row($label, $name, $selected_id)
+function movement_types_list_row($label, $name, $selected_id=null)
 {
 	echo "<tr>\n";
 	movement_types_list_cells($label, $name, $selected_id);
@@ -1046,13 +1117,13 @@ function movement_types_list_row($label, $name, $selected_id)
 
 //-----------------------------------------------------------------------------------------------
 
-function bank_trans_types_list($name, $selected_id)
+function bank_trans_types_list($name, $selected_id=null)
 {
 	$sql = "SELECT id, name FROM ".TB_PREF."bank_trans_types";
 	combo_input($name, $selected_id, $sql, 'id', 'name', array());
 }
 
-function bank_trans_types_list_cells($label, $name, $selected_id)
+function bank_trans_types_list_cells($label, $name, $selected_id=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -1061,7 +1132,7 @@ function bank_trans_types_list_cells($label, $name, $selected_id)
 	echo "</td>\n";
 }
 
-function bank_trans_types_list_row($label, $name, $selected_id)
+function bank_trans_types_list_row($label, $name, $selected_id=null)
 {
 	echo "<tr>\n";
 	bank_trans_types_list_cells($label, $name, $selected_id);
@@ -1070,7 +1141,7 @@ function bank_trans_types_list_row($label, $name, $selected_id)
 
 //-----------------------------------------------------------------------------------------------
 
-function workcenter_list($name, $selected_id, $all_option=false)
+function workcenter_list($name, $selected_id=null, $all_option=false)
 {
 	global $all_items;
 
@@ -1083,7 +1154,7 @@ function workcenter_list($name, $selected_id, $all_option=false)
 	) );
 }
 
-function workcenter_list_cells($label, $name, $selected_id, $all_option=false)
+function workcenter_list_cells($label, $name, $selected_id=null, $all_option=false)
 {
 	default_focus($name);
 	if ($label != null)
@@ -1093,7 +1164,7 @@ function workcenter_list_cells($label, $name, $selected_id, $all_option=false)
 	echo "</td>\n";
 }
 
-function workcenter_list_row($label, $name, $selected_id, $all_option=false)
+function workcenter_list_row($label, $name, $selected_id=null, $all_option=false)
 {
 	echo "<tr>\n";
 	workcenter_list_cells($label, $name, $selected_id, $all_option);
@@ -1102,7 +1173,7 @@ function workcenter_list_row($label, $name, $selected_id, $all_option=false)
 
 //-----------------------------------------------------------------------------------------------
 
-function bank_accounts_list($name, $selected_id, $submit_on_change=false)
+function bank_accounts_list($name, $selected_id=null, $submit_on_change=false)
 {
 	$sql = "SELECT ".TB_PREF."bank_accounts.account_code, bank_account_name, bank_curr_code
 		FROM ".TB_PREF."bank_accounts, ".TB_PREF."chart_master
@@ -1116,7 +1187,7 @@ function bank_accounts_list($name, $selected_id, $submit_on_change=false)
 	) );
 }
 
-function bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change=false)
+function bank_accounts_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -1126,7 +1197,7 @@ function bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change
 	return $str;
 }
 
-function bank_accounts_list_row($label, $name, $selected_id, $submit_on_change=false)
+function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
 	echo "<tr>\n";
 	$str = bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change);
@@ -1136,7 +1207,7 @@ function bank_accounts_list_row($label, $name, $selected_id, $submit_on_change=f
 
 //-----------------------------------------------------------------------------------------------
 
-function class_list($name, $selected_id, $submit_on_change=false)
+function class_list($name, $selected_id=null, $submit_on_change=false)
 {
 	$sql = "SELECT cid, class_name FROM ".TB_PREF."chart_class";
 
@@ -1148,7 +1219,7 @@ function class_list($name, $selected_id, $submit_on_change=false)
 
 }
 
-function class_list_cells($label, $name, $selected_id, $submit_on_change=false)
+function class_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -1158,7 +1229,7 @@ function class_list_cells($label, $name, $selected_id, $submit_on_change=false)
 	return $str;
 }
 
-function class_list_row($label, $name, $selected_id, $submit_on_change=false)
+function class_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
 	echo "<tr>\n";
 	$str = class_list_cells($label, $name, $selected_id, $submit_on_change);
@@ -1168,14 +1239,14 @@ function class_list_row($label, $name, $selected_id, $submit_on_change=false)
 
 //-----------------------------------------------------------------------------------------------
 
-function stock_categories_list($name, $selected_id)
+function stock_categories_list($name, $selected_id=null)
 {
 	$sql = "SELECT category_id, description FROM ".TB_PREF."stock_category";
 	combo_input($name, $selected_id, $sql, 'category_id', 'description',
 	array('order'=>'category_id'));
 }
 
-function stock_categories_list_cells($label, $name, $selected_id)
+function stock_categories_list_cells($label, $name, $selected_id=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -1184,7 +1255,7 @@ function stock_categories_list_cells($label, $name, $selected_id)
 	echo "</td>\n";
 }
 
-function stock_categories_list_row($label, $name, $selected_id)
+function stock_categories_list_row($label, $name, $selected_id=null)
 {
 	echo "<tr>\n";
 	stock_categories_list_cells($label, $name, $selected_id);
@@ -1193,7 +1264,7 @@ function stock_categories_list_row($label, $name, $selected_id)
 
 //-----------------------------------------------------------------------------------------------
 
-function gl_account_types_list($name, $selected_id, $all_option, $all_option_numeric)
+function gl_account_types_list($name, $selected_id=null, $all_option, $all_option_numeric)
 {
 	global $all_items;
 
@@ -1207,7 +1278,7 @@ function gl_account_types_list($name, $selected_id, $all_option, $all_option_num
 	) );
 }
 
-function gl_account_types_list_cells($label, $name, $selected_id, $all_option=false,
+function gl_account_types_list_cells($label, $name, $selected_id=null, $all_option=false,
 	$all_option_numeric=false)
 {
 	if ($label != null)
@@ -1217,7 +1288,7 @@ function gl_account_types_list_cells($label, $name, $selected_id, $all_option=fa
 	echo "</td>\n";
 }
 
-function gl_account_types_list_row($label, $name, $selected_id, $all_option=false,
+function gl_account_types_list_row($label, $name, $selected_id=null, $all_option=false,
 	$all_option_numeric=false)
 {
 	echo "<tr>\n";
@@ -1227,8 +1298,8 @@ 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, $cells=false, $all_option=false)
+function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=false,
+	$show_group=false, $cells=false, $all_option=false, $submit_on_change=false)
 {
 	if ($skip_bank_accounts)
 		$sql = "SELECT chart.account_code, chart.account_name, type.name
@@ -1252,7 +1323,9 @@ function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false,
 			'search_submit' => false,
 			'size' => 12,
 			'max' => 10,
-			'cells' => true
+			'cells' => true,
+		'select_submit'=> $submit_on_change,
+		'async' => false
 	) );
 
 }
@@ -1267,7 +1340,7 @@ function _format_account2($row)
 		return $row[0] .  "&nbsp;&nbsp;&nbsp;&nbsp;" . $row[2] . "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $row[1];
 }
 
-function gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts=false,
+function gl_all_accounts_list_cells($label, $name, $selected_id=null, $skip_bank_accounts=false,
 	$show_group=false, $cells=false, $all_option=false)
 {
 	if ($label != null)
@@ -1277,7 +1350,7 @@ function gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_acco
 	echo "</td>\n";
 }
 
-function gl_all_accounts_list_row($label, $name, $selected_id, $skip_bank_accounts=false,
+function gl_all_accounts_list_row($label, $name, $selected_id=null, $skip_bank_accounts=false,
 	$show_group=false, $cells=false, $all_option=false)
 {
 	echo "<tr>\n";
@@ -1286,45 +1359,19 @@ function gl_all_accounts_list_row($label, $name, $selected_id, $skip_bank_accoun
 	echo "</tr>\n";
 }
 
-function yesno_list($name, $selected_id, $name_yes="", $name_no="", $submit_on_change=false)
+function yesno_list($name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false)
 {
-	default_focus($name);
-	if ($submit_on_change == true)
-		echo "<select name='$name' onchange='this.form.submit();'>"; // FIX ajax
-	else
-		echo "<select name='$name'>";
-
-	if (strlen($name_yes) == 0)
-	{
-		unset($name_yes);
-	}
-	if (strlen($name_no) == 0)
-	{
-		unset($name_no);
-	}
+	$items = array();
+	$items['1'] = strlen($name_yes) ? $name_yes : _("Yes");
+	$items['0'] = strlen($name_no) ? $name_no : _("No");
 
-	if ($selected_id == null)
-		$selected_id = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
-	if ($selected_id == 0)
-		echo "<option value=1>";
-	else
-		echo "<option selected value=1>";
-	if (!isset($name_yes))
-		echo _("Yes") . "</option>\n";
-	else
-		echo $name_yes . "</option>\n";
-	if ($selected_id == 0)
-		echo "<option selected value=0>";
-	else
-		echo "<option value=0>";
-	if (!isset($name_no))
-		echo _("No") . "</option>\n";
-	else
-		echo $name_no . "</option>\n";
-	echo "</select>";
+	return array_selector($name, $selected_id, $items, 
+		array( 
+			'select_submit'=> $submit_on_change,
+			'async' => false ) ); // FIX?
 }
 
-function yesno_list_cells($label, $name, $selected_id, $name_yes="", $name_no="", $submit_on_change=false)
+function yesno_list_cells($label, $name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -1334,7 +1381,7 @@ function yesno_list_cells($label, $name, $selected_id, $name_yes="", $name_no=""
 	return $str;
 }
 
-function yesno_list_row($label, $name, $selected_id, $name_yes="", $name_no="", $submit_on_change=false)
+function yesno_list_row($label, $name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false)
 {
 	echo "<tr>\n";
 	$str = yesno_list_cells($label, $name, $selected_id, $name_yes, $name_no, $submit_on_change);
@@ -1344,25 +1391,18 @@ function yesno_list_row($label, $name, $selected_id, $name_yes="", $name_no="",
 
 //------------------------------------------------------------------------------------------------
 
-function languages_list($name, $selected_id)
+function languages_list($name, $selected_id=null)
 {
 	global $installed_languages;
 
-	default_focus($name);
-	echo "<select name='$name'>";
-
-	if ($selected_id == null)
-		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
+	$items = array();
 	foreach ($installed_languages as $lang)
-	{
-		echo "<option ";
-		if ($selected_id == $lang['code'])
-			echo "selected ";
-		echo "value='" . $lang['code'] . "'>" . $lang['name'] . "</option>\n";
-	}
+			$items[$lang['code']] = $lang['name'];
+	
+	return array_selector($name, $selected_id, $items );
 }
 
-function languages_list_cells($label, $name, $selected_id)
+function languages_list_cells($label, $name, $selected_id=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -1371,7 +1411,7 @@ function languages_list_cells($label, $name, $selected_id)
 	echo "</td>\n";
 }
 
-function languages_list_row($label, $name, $selected_id)
+function languages_list_row($label, $name, $selected_id=null)
 {
 	echo "<tr>\n";
 	languages_list_cells($label, $name, $selected_id);
@@ -1380,25 +1420,20 @@ function languages_list_row($label, $name, $selected_id)
 
 //------------------------------------------------------------------------------------------------
 
-function bank_account_types_list($name, $selected_id)
+function bank_account_types_list($name, $selected_id=null)
 {
-	$bank_account_types = bank_account_types::get_all();
+	$types = bank_account_types::get_all();
 
-	default_focus($name);
-	echo "<select name='$name'>";
-
-	if ($selected_id == null)
-		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	foreach ($bank_account_types as $type)
+	$items = array();
+	foreach ($types as $type)
 	{
-		echo "<option ";
-		if ($selected_id == "" || $selected_id == $type['id'])
-			echo "selected ";
-		echo "value='" . $type['id'] . "'>" . $type['name'] . "</option>\n";
+			$items[$type['id']] = $type['name'];
 	}
+	
+	return array_selector($name, $selected_id, $items );
 }
 
-function bank_account_types_list_cells($label, $name, $selected_id)
+function bank_account_types_list_cells($label, $name, $selected_id=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -1407,7 +1442,7 @@ function bank_account_types_list_cells($label, $name, $selected_id)
 	echo "</td>\n";
 }
 
-function bank_account_types_list_row($label, $name, $selected_id)
+function bank_account_types_list_row($label, $name, $selected_id=null)
 {
 	echo "<tr>\n";
 	bank_account_types_list_cells($label, $name, $selected_id);
@@ -1415,34 +1450,24 @@ function bank_account_types_list_row($label, $name, $selected_id)
 }
 
 //------------------------------------------------------------------------------------------------
-
-function payment_person_types_list($name, $selected_id, $related=null)
+function payment_person_types_list($name, $selected_id=null, $submit_on_change=false)
 {
 	$types = payment_person_types::get_all();
 
-	default_focus($name);
-	echo "<select name='$name'";
-	if ($related)	// FIX ajax
-		echo " onchange='this.form.$related.value=\"\"; this.form.submit();' ";
-	echo ">";
-
-	if ($selected_id == null)
-		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
+	$items = array();
 	foreach ($types as $type)
 	{
 		if (payment_person_types::has_items($type['id']))
 		{
-			if ($selected_id == "")
-				$_POST[$name] = $selected_id = $type['id'];
-			echo "<option ";
-			if ($selected_id == $type['id'])
-				echo "selected ";
-			echo "value='" . $type['id'] . "'>" . $type['name'] . "</option>\n";
+			$items[$type['id']] = $type['name'];
 		}
 	}
+	
+	return array_selector($name, $selected_id, $items, 
+		array( 'select_submit'=> $submit_on_change ) );
 }
 
-function payment_person_types_list_cells($label, $name, $selected_id, $related=null)
+function payment_person_types_list_cells($label, $name, $selected_id=null, $related=null)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -1452,7 +1477,7 @@ function payment_person_types_list_cells($label, $name, $selected_id, $related=n
 	return $str;
 }
 
-function payment_person_types_list_row($label, $name, $selected_id, $related=null)
+function payment_person_types_list_row($label, $name, $selected_id=null, $related=null)
 {
 	echo "<tr>\n";
 	$str = payment_person_types_list_cells($label, $name, $selected_id, $related);
@@ -1462,26 +1487,19 @@ function payment_person_types_list_row($label, $name, $selected_id, $related=nul
 
 //------------------------------------------------------------------------------------------------
 
-function wo_types_list($name, $selected_id)
+function wo_types_list($name, $selected_id=null)
 {
 	$types = wo_types::get_all();
 
-	default_focus($name);	// FIX ajax
-	echo "<select name='$name' onchange='this.form.submit();'>";
-
-	if ($selected_id == null)
-		$selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
+	$items = array();
 	foreach ($types as $type)
-	{
-		echo "<option ";
-		if ($selected_id == $type['id'])
-			echo "selected ";
-		echo "value='" . $type['id'] . "'>" . $type['name'] . "</option>\n";
-	}
-	echo "</select>";
+		$items[$type['id']] = $type['name'];
+	
+	return array_selector($name, $selected_id, $items, 
+		array( 'select_submit'=> true, 'async' => true ) );
 }
 
-function wo_types_list_row($label, $name, $selected_id)
+function wo_types_list_row($label, $name, $selected_id=null)
 {
 	echo "<tr><td>$label</td><td>\n";
 	$str = wo_types_list($name, $selected_id);
@@ -1491,119 +1509,46 @@ function wo_types_list_row($label, $name, $selected_id)
 
 //------------------------------------------------------------------------------------------------
 
-function dateformats_list_row($label, $name, $value)
+function dateformats_list_row($label, $name, $value=null)
 {
 	global $dateformats;
 
-	default_focus($name);
-	echo "<tr><td>$label</td>\n";
-	echo "<td><select name='$name'>";
-
-	if ($value == null)
-		$value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
-	$counter = 0;
-	foreach ($dateformats as $df)
-	{
-
-		if ($value==$counter)
-		{
-			echo "<option selected value='$counter'>$df</option>\n";
-		}
-		else
-		{
-			echo "<option value='$counter'>$df</option>\n";
-		}
-		$counter++;
-	}
-	echo "</select></td></tr>\n";
+	echo "<tr><td>$label</td>\n<td>";
+	array_selector( $name, $value, $dateformats );
+	echo "</td></tr>\n";
 }
 
-function dateseps_list_row($label, $name, $value)
+function dateseps_list_row($label, $name, $value=null)
 {
 	global $dateseps;
 
-	default_focus($name);
-	echo "<tr><td>$label</td>\n";
-	echo "<td><select name='$name'>";
-
-	if ($value == null)
-		$value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
-	$counter = 0;
-	foreach ($dateseps as $ds)
-	{
-
-		if ($value==$counter)
-		{
-			echo "<option selected value='$counter'>$ds</option>\n";
-		}
-		else
-		{
-			echo "<option value='$counter'>$ds</option>\n";
-		}
-		$counter++;
-	}
-	echo "</select></td></tr>\n";
+	echo "<tr><td>$label</td>\n<td>";
+	array_selector( $name, $value, $dateseps );
+	echo "</td></tr>\n";
 }
 
-function thoseps_list_row($label, $name, $value)
+function thoseps_list_row($label, $name, $value=null)
 {
 	global $thoseps;
 
-	default_focus($name);
-	echo "<tr><td>$label</td>\n";
-	echo "<td><select name='$name'>";
-
-	if ($value == null)
-		$value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
-	$counter = 0;
-	foreach ($thoseps as $ts)
-	{
-
-		if ($value==$counter)
-		{
-			echo "<option selected value='$counter'>$ts</option>\n";
-		}
-		else
-		{
-			echo "<option value='$counter'>$ts</option>\n";
-		}
-		$counter++;
-	}
-	echo "</select></td></tr>\n";
+	echo "<tr><td>$label</td>\n<td>";
+	array_selector( $name, $value, $thoseps );
+	echo "</td></tr>\n";
 }
 
-function decseps_list_row($label, $name, $value)
+function decseps_list_row($label, $name, $value=null)
 {
 	global $decseps;
 
-	default_focus($name);
-	echo "<tr><td>$label</td>\n";
-	echo "<td><select name='$name'>";
-
-	if ($value == null)
-		$value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
-	$counter = 0;
-	foreach ($decseps as $ds)
-	{
-
-		if ($value==$counter)
-		{
-			echo "<option selected value='$counter'>$ds</option>\n";
-		}
-		else
-		{
-			echo "<option value='$counter'>$ds</option>\n";
-		}
-		$counter++;
-	}
-	echo "</select></td></tr>\n";
+	echo "<tr><td>$label</td>\n<td>";
+	array_selector( $name, $value, $decseps );
+	echo "</td></tr>\n";
 }
 
-function themes_list_row($label, $name, $value)
+function themes_list_row($label, $name, $value=null)
 {
 	global $path_to_root;
 
-	default_focus($name);
 	$path = $path_to_root.'/themes/';
 	$themes = array();
 	$themedir = opendir($path);
@@ -1611,112 +1556,61 @@ function themes_list_row($label, $name, $value)
 	{
 		if($fname!='.' && $fname!='..' && $fname!='CVS' && is_dir($path.$fname))
 		{
-			$themes[] =  $fname;
+			$themes[$fname] =  $fname;
 		}
 	}
-	sort($themes);
-	echo "<tr><td>$label</td>\n";
-	echo "<td><select name='$name'>";
+	ksort($themes);
 
-	if ($value == null)
-		$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	foreach ($themes as $th)
-	{
-
-		if ($value==$th)
-		{
-			echo "<option selected value='$th'>$th</option>\n";
-		}
-		else
-		{
-			echo "<option value='$th'>$th</option>\n";
-		}
-	}
-	echo "</select></td></tr>\n";
+	echo "<tr><td>$label</td>\n<td>";
+	array_selector( $name, $value, $themes );
+	echo "</td></tr>\n";
 }
 
-function pagesizes_list_row($label, $name, $value)
+function pagesizes_list_row($label, $name, $value=null)
 {
 	global $pagesizes;
 
-	default_focus($name);
-	echo "<tr><td>$label</td>\n";
-	echo "<td><select name='$name'>";
-
-	if ($value == null)
-		$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
+	$items = array();
 	foreach ($pagesizes as $pz)
-	{
+		$items[$pz] = $pz;
 
-		if ($value==$pz)
-		{
-			echo "<option selected value='$pz'>$pz</option>\n";
-		}
-		else
-		{
-			echo "<option value='$pz'>$pz</option>\n";
-		}
-	}
-	echo "</select></td></tr>\n";
+	echo "<tr><td>$label</td>\n<td>";
+	array_selector( $name, $value, $items );
+	echo "</td></tr>\n";
 }
 
-function security_headings_list_row($label, $name, $value)
+function security_headings_list_row($label, $name, $value=null)
 {
 	global $security_headings;
 
-	default_focus($name);
-	echo "<tr><td>$label</td>\n";
-	echo "<td><select name='$name'>";
-
-	if ($value == null)
-		$value = (!isset($_POST[$name]) ? 0 : (int)$_POST[$name]);
-	$counter=0;
-	foreach ($security_headings as $sh)
-	{
-
-		if ($value==$counter)
-		{
-			echo "<option selected value='$counter'>$sh</option>\n";
-		}
-		else
-		{
-			echo "<option value='$counter'>$sh</option>\n";
-		}
-		$counter++;
-	}
-	echo "</select></td></tr>\n";
+	echo "<tr><td>$label</td>\n<td>";
+	array_selector( $name, $value, $security_headings );
+	echo "</td></tr>\n";
 }
 
-function systypes_list_cells($label, $name, $value, $submit_on_change=false)
+function systypes_list_cells($label, $name, $value=null, $submit_on_change=false)
 {
 	global $systypes_array;
 
-	default_focus($name);
 	if ($label != null)
 		echo "<td>$label</td>\n";
-	echo "<td><select name='$name'";
-	if ($submit_on_change)
-		echo " onchange='this.form.submit();'>";	// FIX ajax
-	else
-		echo ">";
-	if ($value == null)
-		$value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	foreach ($systypes_array as $key=>$type)
-	{
+	echo "<td>";
 
-		if ($value==$key)
-		{
-			echo "<option selected value='$key'>".$type['name']."</option>\n";
-		}
-		else
-		{
-			echo "<option value='$key'>".$type['name']."</option>\n";
-		}
-	}
-	echo "</select></td>\n";
+	$items = array();
+	foreach ($systypes_array as $key=>$type)
+			$items[$key] = $type['name'];
+	
+	$str = array_selector($name, $value, $items, 
+		array( 
+			'select_submit'=> $submit_on_change,
+			'async' => false
+			)
+	);
+	echo "</td>\n";
+	return $str;
 }
 
-function systypes_list_row($label, $name, $value, $submit_on_change=false)
+function systypes_list_row($label, $name, $value=null, $submit_on_change=false)
 {
 	echo "<tr>\n";
 	$str = systypes_list_cells($label, $name, $value, $submit_on_change);
@@ -1724,87 +1618,77 @@ function systypes_list_row($label, $name, $value, $submit_on_change=false)
 	return $str;
 }
 
-function cust_allocations_list_cells($label, $name, $selected)
+function cust_allocations_list_cells($label, $name, $selected=null)
 {
 	global $all_items;
-	default_focus($name);
+
 	if ($label != null)
 		label_cell($label);
-	if ($selected == null)
-		$selected = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	echo "<td><select name='$name'>";
-	echo "<option " . ($selected == $all_items ? " selected " : "") . " value='$all_items'>" . _("All Types"). "</option>\n";
-	echo "<option " . ($selected == '1'?" selected ":"") . " value='1'>" . _("Sales Invoices"). "</option>\n";
-	echo "<option " . ($selected == '2'?" selected ":"") . " value='2'>" . _("Overdue Invoices"). "</option>\n";
-	echo "<option " . ($selected == '3'?" selected ":"") . " value='3'>" . _("Payments"). "</option>\n";
-	echo "<option " . ($selected == '4'?" selected ":"") . " value='4'>" . _("Credit Notes"). "</option>\n";
-	echo "<option " . ($selected == '5'?" selected ":"") . " value='5'>" . _("Delivery Notes"). "</option>\n";
-	echo "</select></td>\n";
+	echo "<td>\n";
+	$allocs = array( 
+		$all_items=>_("All Types"),
+		'1'=> _("Sales Invoices"),
+		'2'=> _("Overdue Invoices"),
+		'3' => _("Payments"),
+		'4' => _("Credit Notes"),
+		'5' => _("Delivery Notes")
+	);
+	$str = array_selector($name, $selected, $allocs);
+	echo "</td>\n";
+	return $str;
 }
 
-function supp_allocations_list_cells($name, $selected)
+function supp_allocations_list_cell($name, $selected=null)
 {
 	global $all_items;
 
-	default_focus($name);
-	if ($selected == null)
-		$selected = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-	echo "<td><select name='$name'>";
-	echo "<option " . ($selected == $all_items ? " selected " : "") . " value='$all_items'>" . _("All Types"). "</option>\n";
-	echo "<option " . ($selected == '1'?" selected ":"") . " value='1'>" . _("Invoices"). "</option>\n";
-	echo "<option " . ($selected == '2'?" selected ":"") . " value='2'>" . _("Overdue Invoices"). "</option>\n";
-	echo "<option " . ($selected == '3'?" selected ":"") . " value='3'>" . _("Payments"). "</option>\n";
-	echo "<option " . ($selected == '4'?" selected ":"") . " value='4'>" . _("Credit Notes"). "</option>\n";
-	echo "<option " . ($selected == '5'?" selected ":"") . " value='5'>" . _("Overdue Credit Notes"). "</option>\n";
-	echo "</select></td>\n";
+	echo "<td>\n";
+	$allocs = array( 
+		$all_items=>_("All Types"),
+		'1'=> _("Invoices"),
+		'2'=> _("Overdue Invoices"),
+		'3' => _("Payments"),
+		'4' => _("Credit Notes"),
+		'5' => _("Overdue Credit Notes")
+	);
+	$str = array_selector($name, $selected, $allocs);
+	echo "</td>\n";
+	return $str;
 }
 
-function policy_list_cells($label, $name, $selected)
+function policy_list_cells($label, $name, $selected=null)
 {
-	default_focus($name);
-	if ($selected == null)
-	{
-		$selected = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-		if ($selected == "")
-			$_POST[$name] = $selected;
-	}
 	if ($label != null)
 		label_cell($label);
-	echo "<td><select name='$name'>";
-	echo "<option " . ($selected == ''?" selected ":"") . " value=''>" . _("Automatically put balance on back order"). "</option>\n";
-	echo "<option " . ($selected == 'CAN'?" selected ":"") . " value='CAN'>" . _("Cancel any quantites not delivered"). "</option>\n";
-	echo "</select></td>\n";
+	echo "<td>\n";
+	$str = array_selector($name, $selected, 
+				array( '' => _("Automatically put balance on back order"),
+			 		'CAN' => _("Cancel any quantites not delivered")) );
+	echo "</td>\n";
+	return $str;
 }
 
-function policy_list_row($label, $name, $selected)
+function policy_list_row($label, $name, $selected=null)
 {
 	echo "<tr>\n";
 	policy_list_cells($label, $name, $selected);
 	echo "</tr>\n";
 }
 
-function credit_type_list_cells($label, $name, $selected, $submit_on_change=false)
+function credit_type_list_cells($label, $name, $selected=null, $submit_on_change=false)
 {
-	default_focus($name);
-	if ($selected == null)
-	{
-		$selected = (!isset($_POST[$name]) ? "Return" : $_POST[$name]);
-		if ($selected == "Return")
-			$_POST[$name] = $selected;
-	}
 	if ($label != null)
 		label_cell($label);
-	echo "<td><select name='$name'";
-	if ($submit_on_change)
-		echo " onchange='JsHttpRequest.request(\"_{$name}_update\", this.form);'>";
-	else
-		echo ">";
-	echo "<option " . ($selected == 'Return'?" selected ":"") . " value='Return'>" . _("Items Returned to Inventory Location"). "</option>\n";
-	echo "<option " . ($selected == 'WriteOff'?" selected ":"") . " value='WriteOff'>" . _("Items Written Off"). "</option>\n";
-	echo "</select></td>\n";
+	echo "<td>\n";
+	$str = array_selector($name, $selected, 
+				array( 'Return' => _("Items Returned to Inventory Location"),
+			 		'WriteOff' => _("Items Written Off")),
+				array( 'select_submit'=> $submit_on_change ) );
+	echo "</td>\n";
+	return $str;
 }
 
-function credit_type_list_row($label, $name, $selected, $submit_on_change=false)
+function credit_type_list_row($label, $name, $selected=null, $submit_on_change=false)
 {
 	echo "<tr>\n";
 	$str = credit_type_list_cells($label, $name, $selected, $submit_on_change);
@@ -1814,38 +1698,13 @@ function credit_type_list_row($label, $name, $selected, $submit_on_change=false)
 
 function number_list($name, $selected, $from, $to, $no_option=false)
 {
-	default_focus($name);
-	if ($selected == null)
-	{
-		$selected = (!isset($_POST[$name]) ? reserved_words::get_all_numeric() : $_POST[$name]);
-	}
-	echo "<select name='$name'>";
-	if ($no_option !== false)
-	{
-		$reserved_word = reserved_words::get_all_numeric();
-
-    	if ($selected == $reserved_word)
-    	{
-    	     echo "<option selected value='$reserved_word'>$no_option</option>\n";
-    	}
-    	else
-    	{
-    	     echo "<option value='$reserved_word'>$no_option</option>\n";
-    	}
-	}
-
+	$items = array();
 	for ($i = $from; $i <= $to; $i++)
-	{
-		if ($selected == $i)
-		{
-			echo "<option selected value='$i'>$i</option>\n";
-		}
-		else
-		{
-			echo "<option value='$i'>$i</option>\n";
-		}
-	}
-	echo "</select>\n";
+		$items[$i] = "$i";
+
+	return array_selector($name, $selected, $items,
+				array(	'spec_option' => $no_option,
+						'spec_id' => reserved_words::get_all_numeric()) );
 }
 
 function number_list_cells($label, $name, $selected, $from, $to, $no_option=false)
@@ -1863,4 +1722,5 @@ function number_list_row($label, $name, $selected, $from, $to, $no_option=false)
 	number_list_cells($label, $name, $selected, $from, $to, $no_option);
 	echo "</tr>\n";
 }
+
 ?>
\ No newline at end of file