X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=a68454cf8b267c7c1a0a430a0e9e81ae49da44dd;hb=ca45fa23d2d83705e11007acafd52528718ae5aa;hp=672f1950d98d518799e982399f4d9ea22ab6c52f;hpb=f018643dc04ce130f1729e16a65458af443308a0;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 672f1950..a68454cf 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -10,7 +10,6 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 include_once($path_to_root . "/includes/banking.inc");
-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");
 
@@ -20,7 +19,7 @@ $_search_button = "<input %s type='submit' class='combo_submit' style='border:0;
 $_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();
+$all_items = ALL_TEXT;
 
 //----------------------------------------------------------------------------
 //	Universal sql combo generator
@@ -40,6 +39,7 @@ $opts = array(		// default options
 	'spec_id' => 0,		// option id
 		// submit on select parameters
 	'default' => '', // default value when $_POST is not set
+	'multi' => false,	// multiple select
 	'select_submit' => false, //submit on select: true/false
 	'async' => true,	// select update via ajax (true) vs _page_body reload
 		// search box parameters
@@ -53,6 +53,7 @@ $opts = array(		// default options
 	'search_submit' => true, //search submit button: true/false
 	'size' => 8,	// size and max of box tag
 	'max' => 50,
+	'height' => false,	// number of lines in select box
 	'cells' => false,	// combo displayed as 2 <td></td> cells
 	'search' => array(), // sql field names to search
 	'format' => null, 	 // format functions for regular options
@@ -68,13 +69,14 @@ $opts = array(		// default options
 
 	$search_box = $opts['search_box']===true ? '_'.$name.'_edit' : $opts['search_box'];
 	$search_submit = $opts['search_submit']===true ? '_'.$name.'_button' : $opts['search_submit'];
-	$select_submit =  $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit'];
+	$select_submit =  $opts['select_submit'];
 	$spec_id = $opts['spec_id'];
 	$spec_option = $opts['spec_option'];
 	$by_id = ($opts['type'] == 0);
 	$class = $by_id ? 'combo':'combo2';
 	$disabled = $opts['disabled'] ? "disabled" : '';
-
+	$multi = $opts['multi'];
+	
 	if(!count($opts['search'])) {
 		$opts['search'] = array($by_id ? $valfield : $namefield);
 	}
@@ -90,11 +92,14 @@ $opts = array(		// default options
 	if ($selected_id == null) {
 		$selected_id = get_post($name, $opts['default']);
 	}
+	if(!is_array($selected_id))
+		$selected_id = array($selected_id); // code is generalized for multiple selection support
+
 	$txt = get_post($search_box);
 	$rel = '';
 	$limit = '';
 
-	if (isset($_POST[$select_submit])) {
+	if (isset($_POST['_'.$name.'_update'])) {
 		if ($by_id) $txt = $_POST[$name];
 
 		if (!$opts['async'])
@@ -108,14 +113,14 @@ $opts = array(		// default options
 	$rel = "rel='$search_box'"; // set relation to list
    if ($opts['search_submit']) {
 	if (isset($_POST[$search_submit])) {
-		$selected_id = ''; // ignore selected_id while search
+		$selected_id = array(); // ignore selected_id while search
 		if (!$opts['async'])
 			$Ajax->activate('_page_body');
 		else
 			$Ajax->activate($name);
 	}
 	if ($txt == '') {
-		if ($spec_option === false && $selected_id==null)
+		if ($spec_option === false && $selected_id == array())
 		  $limit = ' LIMIT 1';
 		else
 		  $opts['where'][] = $valfield . "='". get_post($name, $spec_id)."'";
@@ -158,12 +163,12 @@ $opts = array(		// default options
 		while ($contact_row = db_fetch($result)) {
 			$value = $contact_row[0];
 			$descr = $opts['format']==null ?  $contact_row[1] :
-			call_user_func($opts['format'], $contact_row);
+				call_user_func($opts['format'], $contact_row);
 			$sel = '';
  		 	if (get_post($search_submit) && ($txt === $value)) {
- 		 		$selected_id = $value;
+ 		 		$selected_id[] = $value;
  		 	}
- 		 	if	((string)($selected_id) === $value) {
+ 		 	if (in_array($value, $selected_id)) {
 				$sel = 'selected';
 				$found = $value;
 			}
@@ -199,16 +204,18 @@ $opts = array(		// default options
 			. $selector;
 	}
 
-	if ($found === false) {
-		$selected_id = $first_id;
+	if ($found===false) {
+		$selected_id = array($first_id);
 	}
-	$_POST[$name] = $selected_id;
+	$_POST[$name] = $multi ? $selected_id : $selected_id[0];
 
 	if ($by_id && $search_box != false) {
  		$txt = $found;
 		$Ajax->addUpdate($name, $search_box, $txt ? $txt : '');
 	}
-	$selector = "<select $disabled name='$name' class='$class' title='"
+	$selector = "<select ".($multi ? "multiple" : '')
+		. ($opts['height']!==false ? ' size="'.$opts['height'].'"' : '')
+		. "$disabled name='$name".($multi ? '[]':'')."' class='$class' title='"
 		. $opts['sel_hint']."' $rel>".$selector."</select>\n";
 
 	$Ajax->addUpdate($name, "_{$name}_sel", $selector);
@@ -222,7 +229,7 @@ $opts = array(		// default options
 	// button class selects form reload/ajax selector update
 		$selector .= sprintf($_select_button, $disabled, user_theme(),
 			(fallback_mode() ? '' : 'display:none;'),
-			$select_submit)."\n";
+			 '_'.$name.'_update')."\n";
 	}
 // ------ make combo ----------
 
@@ -247,7 +254,6 @@ $opts = array(		// default options
 		echo ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector</td>";
 	else
 		echo $edit_entry.$selector;
-
 	return $str;
 }
 
@@ -274,23 +280,28 @@ $opts = array(		// default options
 	'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
+	'multi'=>false,	// multiple select
 		// search box parameters
+	'height' => false,	// number of lines in select box
 	'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'];
+	$select_submit =  $opts['select_submit'];
 	$spec_id = $opts['spec_id'];
 	$spec_option = $opts['spec_option'];
 	$disabled = $opts['disabled'] ? "disabled" : '';
+	$multi = $opts['multi'];
 
 	if ($selected_id == null) {
 		$selected_id = get_post($name, $opts['default']);
 	}
+	if(!is_array($selected_id))
+		$selected_id = array($selected_id); // code is generalized for multiple selection support
 
-	if (isset($_POST[$select_submit])) {
+	if (isset($_POST[ '_'.$name.'_update'])) {
 		if (!$opts['async'])
 			$Ajax->activate('_page_body');
 		else
@@ -304,7 +315,7 @@ $opts = array(		// default options
 //if($name=='SelectStockFromList') display_error($sql);
 		foreach($items as $value=>$descr) {
 			$sel = '';
-			if ((string)$selected_id === (string)$value) {
+			if (in_array((string)$value, $selected_id)) {
 				$sel = 'selected';
 				$found = $value;
 			}
@@ -325,11 +336,12 @@ $opts = array(		// default options
 	}
 
 	if ($found === false) {
-		$selected_id = $first_id;
+		$selected_id[] = $first_id;
 	}
-	$_POST[$name] = $selected_id;
-
-	$selector = "<select $disabled name='$name' class='combo' title='"
+	$_POST[$name] = $multi ? $selected_id : $selected_id[0];
+	$selector = "<select ".($multi  ? "multiple" : '')
+		. ($opts['height']!==false ? ' size="'.$opts['height'].'"' : '')
+		. "$disabled name='$name".($multi ? '[]' : '')."' class='combo' title='"
 		. $opts['sel_hint']."'>".$selector."</select>\n";
 
 	$Ajax->addUpdate($name, "_{$name}_sel", $selector);
@@ -340,7 +352,7 @@ $opts = array(		// default options
 		global $_select_button;
 		$selector .= sprintf($_select_button, $disabled, user_theme(),
 			(fallback_mode() ? '' : 'display:none;'),
-			$select_submit)."\n";
+			 '_'.$name.'_update')."\n";
 	}
 	default_focus($name);
 	echo $selector;
@@ -362,17 +374,21 @@ function _format_add_curr($row)
 }
 
 function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
-	$all=false)
+	$all=false, $editkey = false)
 {
 	global $all_items;
 
-	$sql = "SELECT supplier_id, supp_name, curr_code, inactive FROM ".TB_PREF."suppliers ";
+	$sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers ";
 
 	$mode = get_company_pref('no_supplier_list');
 
+	if ($editkey)
+		set_editor('supplier', $name, $editkey);
+		
 	return combo_input($name, $selected_id, $sql, 'supplier_id', 'supp_name',
 	array(
 		'format' => '_format_add_curr',
+	    'order' => array('supp_ref'),
 		'search_box' => $mode!=0,
 		'type' => 1,
 		'spec_option' => $spec_option === true ? _("All Suppliers") : $spec_option,
@@ -386,35 +402,43 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
 }
 
 function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, 
-	$submit_on_change=false, $all=false)
+	$submit_on_change=false, $all=false, $editkey = false)
 {
 	if ($label != null)
 		echo "<td>$label</td><td>\n";
-	$str = supplier_list($name, $selected_id, $all_option, $submit_on_change, $all);
+	$str = supplier_list($name, $selected_id, $all_option, $submit_on_change, 
+		$all, $editkey);
 		echo "</td>\n";
 	return $str;
 }
 
-function supplier_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false)
+function supplier_list_row($label, $name, $selected_id=null, $all_option = false, 
+	$submit_on_change=false, $all=false, $editkey = false)
 {
 echo "<tr><td>$label</td><td>";
-	$str = supplier_list($name, $selected_id, $all_option, $submit_on_change );
+	$str = supplier_list($name, $selected_id, $all_option, $submit_on_change,
+		$all, $editkey);
 echo "</td></tr>\n";
 return $str;
 }
 //----------------------------------------------------------------------------------------------
 
-function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, $show_inactive=false)
+function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, 
+	$show_inactive=false, $editkey = false)
 {
 	global $all_items;
 
-	$sql = "SELECT debtor_no, name, curr_code, inactive FROM ".TB_PREF."debtors_master ";
+	$sql = "SELECT debtor_no, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master ";
 
 	$mode = get_company_pref('no_customer_list');
 
+	if ($editkey)
+		set_editor('customer', $name, $editkey);
+
 return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
 	array(
 	    'format' => '_format_add_curr',
+	    'order' => array('debtor_ref'),
 		'search_box' => $mode!=0,
 		'type' => 1,
 		'size' => 20,
@@ -429,23 +453,23 @@ return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
 }
 
 function customer_list_cells($label, $name, $selected_id=null, $all_option=false, 
-	$submit_on_change=false, $show_inactive=false)
+	$submit_on_change=false, $show_inactive=false, $editkey = false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td nowrap>";
 	$str = customer_list($name, $selected_id, $all_option, $submit_on_change,
-		$show_inactive);
+		$show_inactive, $editkey);
 	echo "</td>\n";
 	return $str;
 }
 
 function customer_list_row($label, $name, $selected_id=null, $all_option = false, 
-	$submit_on_change=false, $show_inactive=false)
+	$submit_on_change=false, $show_inactive=false, $editkey = false)
 {
 	echo "<tr><td>$label</td><td nowrap>";
 	$str = customer_list($name, $selected_id, $all_option, $submit_on_change,
-		$show_inactive);
+		$show_inactive, $editkey);
 	echo "</td>\n</tr>\n";
 	return $str;
 }
@@ -453,17 +477,21 @@ function customer_list_row($label, $name, $selected_id=null, $all_option = false
 //------------------------------------------------------------------------------------------------
 
 function customer_branches_list($customer_id, $name, $selected_id=null,
-	$spec_option = true, $enabled=true, $submit_on_change=false)
+	$spec_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
 {
 	global $all_items;
 
-	$sql = "SELECT branch_code, br_name FROM ".TB_PREF."cust_branch
+	$sql = "SELECT branch_code, branch_ref FROM ".TB_PREF."cust_branch
 		WHERE debtor_no='" . $customer_id . "' ";
 
+	if ($editkey)
+		set_editor('branch', $name, $editkey);
+
 	$where = $enabled ? array("disable_trans = 0") : array();
 return  combo_input($name, $selected_id, $sql, 'branch_code', 'br_name',
 	array(
 		'where' => $where,
+		'order' => array('branch_ref'),
 		'spec_option' => $spec_option === true ? _('All branches') : $spec_option,
 		'spec_id' => $all_items,
 		'select_submit'=> $submit_on_change,
@@ -472,20 +500,24 @@ return  combo_input($name, $selected_id, $sql, 'branch_code', 'br_name',
 }
 //------------------------------------------------------------------------------------------------
 
-function customer_branches_list_cells($label,$customer_id, $name, $selected_id=null, $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, $editkey = false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
-	$ret = customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
+	$ret = customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled, 
+		$submit_on_change, $editkey);
 	echo "</td>\n";
 	return $ret;
 }
 
-function customer_branches_list_row($label,$customer_id, $name, $selected_id=null, $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, $editkey = false)
 {
 	echo "<tr>";
-	$ret = customer_branches_list_cells($label, $customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
+	$ret = customer_branches_list_cells($label, $customer_id, $name, $selected_id, 
+		$all_option, $enabled, $submit_on_change, $editkey);
 	echo "</tr>";
 	return $ret;
 }
@@ -647,13 +679,16 @@ function dimensions_list_row($label, $name, $selected_id=null, $no_option=false,
 //---------------------------------------------------------------------------------------------------
 
 function stock_items_list($name, $selected_id=null, $all_option=false, 
-	$submit_on_change=false, $opts=array())
+	$submit_on_change=false, $opts=array(), $editkey = false)
 {
 	global $all_items;
 
 	$sql = "SELECT stock_id, s.description, c.description, s.inactive
 			FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id";
 
+	if ($editkey)
+		set_editor('item', $name, $editkey);
+
 	return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
 	array_merge(
 	  array(
@@ -676,12 +711,12 @@ function _format_stock_items($row)
 }
 
 function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, 
-	$submit_on_change=false, $all=false)
+	$submit_on_change=false, $all=false, $editkey = false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-		array('cells'=>true, 'show_inactive'=>$all));
+		array('cells'=>true, 'show_inactive'=>$all), $editkey);
 	return $str;
 }
 /*
@@ -796,20 +831,21 @@ function stock_manufactured_items_list_row($label, $name, $selected_id=null,
 //------------------------------------------------------------------------------------
 
 function stock_component_items_list($name, $parent_stock_id, $selected_id=null,
-	$all_option=false, $submit_on_change=false)
+	$all_option=false, $submit_on_change=false, $editkey = false)
 {
 	$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-		array('where'=>array("stock_id != '$parent_stock_id'")));
+		array('where'=>array("stock_id != '$parent_stock_id'")), $editkey);
 	return $str;
 }
 
 function stock_component_items_list_cells($label, $name, $parent_stock_id, 
-	$selected_id=null, $all_option=false, $submit_on_change=false)
+	$selected_id=null, $all_option=false, $submit_on_change=false, $editkey = 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));
+		array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true),
+		$editkey);
 	return $str;
 }
 //------------------------------------------------------------------------------------
@@ -834,31 +870,31 @@ function stock_costable_items_list_cells($label, $name, $selected_id=null,
 
 //------------------------------------------------------------------------------------
 function stock_purchasable_items_list($name, $selected_id=null,	
-	$all_option=false, $submit_on_change=false, $all=false)
+	$all_option=false, $submit_on_change=false, $all=false, $editkey=false)
 {
 	$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
 		array('where'=>array("mb_flag!= 'M'"), 
-			'show_inactive'=>$all));
+			'show_inactive'=>$all), $editkey);
 	return $str;
 }
 
 function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
-			$all_option=false, $submit_on_change=false, $all=false)
+			$all_option=false, $submit_on_change=false, $editkey=false)
 {
 	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!= 'M'"), 
-			 'cells'=>true));
+			 'cells'=>true), $editkey);
 	return $str;
 }
 
 function stock_purchasable_items_list_row($label, $name, $selected_id=null,
-			$all_option=false, $submit_on_change=false)
+			$all_option=false, $submit_on_change=false, $editkey=false)
 {
 	echo "<tr>\n";
 	$ret = stock_purchasable_items_list_cells($label, $name, $selected_id=null,
-		$all_option, $submit_on_change);
+		$all_option, $submit_on_change, $editkey);
 	echo "</tr>\n";
 	return $ret;
 }
@@ -906,7 +942,7 @@ function tax_types_list($name, $selected_id=null, $none_option=false, $submit_on
 	return combo_input($name, $selected_id, $sql, 'id', 'name',
 	array(
 		'spec_option' => $none_option,
-		'spec_id' => reserved_words::get_all_numeric(),
+		'spec_id' => ALL_NUMERIC,
 		'select_submit'=> $submit_on_change,
 		'async' => false,
 	) );
@@ -943,7 +979,7 @@ function tax_groups_list($name, $selected_id=null,
 	array(
 		'order' => 'id',
 		'spec_option' => $none_option,
-		'spec_id' => reserved_words::get_all_numeric(),
+		'spec_id' => ALL_NUMERIC,
 		'select_submit'=> $submit_on_change,
 		'async' => false,
 	) );
@@ -996,7 +1032,8 @@ function item_tax_types_list_row($label, $name, $selected_id=null)
 function shippers_list($name, $selected_id=null)
 {
 	$sql = "SELECT shipper_id, shipper_name, inactive FROM ".TB_PREF."shippers";
-	combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', array());
+	combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', 
+		array('order'=>array('shipper_name')));
 }
 
 function shippers_list_cells($label, $name, $selected_id=null)
@@ -1020,7 +1057,8 @@ function shippers_list_row($label, $name, $selected_id=null)
 function sales_persons_list($name, $selected_id=null)
 {
 	$sql = "SELECT salesman_code, salesman_name, inactive FROM ".TB_PREF."salesman";
-	combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', array());
+	combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', 
+		array('order'=>array('salesman_name')));
 }
 
 function sales_persons_list_cells($label, $name, $selected_id=null)
@@ -1394,6 +1432,7 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub
 		'async' => true,
 		'spec_option' =>$spec_option,
 		'spec_id' => -1,
+		'order'=> array('pos_name')
 	) );
 	echo "</td></tr>\n";
 
@@ -1510,14 +1549,14 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
 	$cells=false, $all_option=false, $submit_on_change=false, $all=false)
 {
 	if ($skip_bank_accounts)
-		$sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive
+		$sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
 			FROM (".TB_PREF."chart_master chart,".TB_PREF."chart_types type) "
 			."LEFT JOIN ".TB_PREF."bank_accounts acc "
 			."ON chart.account_code=acc.account_code
 				WHERE acc.account_code  IS NULL
 			AND chart.account_type=type.id";
 	else
-		$sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive
+		$sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
 			FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type
 			WHERE chart.account_type=type.id";
 
@@ -1526,7 +1565,7 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
 		'format' => '_format_account',
 		'spec_option' => $all_option===true ?  _("Use Item Sales Accounts") : $all_option,
 		'spec_id' => '',
-		'order' => array('name','account_code'),
+		'order' => array('type.id','account_code'),
 		'search_box' => $cells,
 			'search_submit' => false,
 			'size' => 12,
@@ -1606,7 +1645,7 @@ function languages_list($name, $selected_id=null)
 	foreach ($installed_languages as $lang)
 			$items[$lang['code']] = $lang['name'];
 	
-	return array_selector($name, $selected_id, $items );
+	return array_selector($name, $selected_id, $items);
 }
 
 function languages_list_cells($label, $name, $selected_id=null)
@@ -1629,15 +1668,9 @@ function languages_list_row($label, $name, $selected_id=null)
 
 function bank_account_types_list($name, $selected_id=null)
 {
-	$types = bank_account_types::get_all();
+	global $bank_account_types;
 
-	$items = array();
-	foreach ($types as $type)
-	{
-			$items[$type['id']] = $type['name'];
-	}
-	
-	return array_selector($name, $selected_id, $items );
+	return array_selector($name, $selected_id, $bank_account_types);
 }
 
 function bank_account_types_list_cells($label, $name, $selected_id=null)
@@ -1659,18 +1692,14 @@ function bank_account_types_list_row($label, $name, $selected_id=null)
 //------------------------------------------------------------------------------------------------
 function payment_person_types_list($name, $selected_id=null, $submit_on_change=false)
 {
-	$types = payment_person_types::get_all();
+	global $payment_person_types;
 
 	$items = array();
-	foreach ($types as $type)
+	foreach ($payment_person_types as $key=>$type)
 	{
-		if (payment_person_types::has_items($type['id']))
-		{
-			if ($type['id'] != payment_person_types::WorkOrder())
-				$items[$type['id']] = $type['name'];
-		}
-	}
-	
+		if ($key != PT_WORKORDER)
+			$items[$key] = $type;
+	}		
 	return array_selector($name, $selected_id, $items, 
 		array( 'select_submit'=> $submit_on_change ) );
 }
@@ -1697,13 +1726,9 @@ function payment_person_types_list_row($label, $name, $selected_id=null, $relate
 
 function wo_types_list($name, $selected_id=null)
 {
-	$types = wo_types::get_all();
-
-	$items = array();
-	foreach ($types as $type)
-		$items[$type['id']] = $type['name'];
+	global $wo_types_array;
 	
-	return array_selector($name, $selected_id, $items, 
+	return array_selector($name, $selected_id, $wo_types_array, 
 		array( 'select_submit'=> true, 'async' => true ) );
 }
 
@@ -1787,15 +1812,6 @@ function pagesizes_list_row($label, $name, $value=null)
 	echo "</td></tr>\n";
 }
 
-function security_headings_list_row($label, $name, $value=null)
-{
-	global $security_headings;
-
-	echo "<tr><td>$label</td>\n<td>";
-	array_selector( $name, $value, $security_headings );
-	echo "</td></tr>\n";
-}
-
 function systypes_list_cells($label, $name, $value=null, $submit_on_change=false)
 {
 	global $systypes_array;
@@ -1803,15 +1819,12 @@ function systypes_list_cells($label, $name, $value=null, $submit_on_change=false
 	if ($label != null)
 		echo "<td>$label</td>\n";
 	echo "<td>";
-
-	$items = array();
-	foreach ($systypes_array as $key=>$type)
-			$items[$key] = $type['name'];
 	
-	$str = array_selector($name, $value, $items, 
+	$str = array_selector($name, $value, $systypes_array, 
 		array( 
 			'select_submit'=> $submit_on_change,
-			'async' => false
+			'async' => false,
+			'default' => 0
 			)
 	);
 	echo "</td>\n";
@@ -1826,11 +1839,12 @@ function journal_types_list_cells($label, $name, $value=null, $submit_on_change=
 		echo "<td>$label</td>\n";
 	echo "<td>";
 
-	$items = array();
-	foreach ($systypes_array as $key=>$type)
-		// exclude orders and dimensions
-		if (!in_array($key, array(18,26,30,40)))
-			$items[$key] = $type['name'];
+	$items = $systypes_array;
+
+	// exclude quotes, orders and dimensions
+	foreach (array(ST_PURCHORDER, ST_WORKORDER, ST_SALESORDER, ST_DIMENSION, 
+				ST_SALESQUOTE) as $excl)
+			unset($items[$excl]);
 	
 	$str = array_selector($name, $value, $items, 
 		array( 
@@ -1938,7 +1952,7 @@ function number_list($name, $selected, $from, $to, $no_option=false)
 
 	return array_selector($name, $selected, $items,
 				array(	'spec_option' => $no_option,
-						'spec_id' => reserved_words::get_all_numeric()) );
+						'spec_id' => ALL_NUMERIC) );
 }
 
 function number_list_cells($label, $name, $selected, $from, $to, $no_option=false)
@@ -2075,5 +2089,120 @@ function class_types_list_row($label, $name, $selected_id=null, $submit_on_chang
 	echo "</td></tr>\n";
 }
 
+//------------------------------------------------------------------------------------------------
+
+function security_roles_list($name, $selected_id=null, $new_item=false, $submit_on_change=false,
+	$show_inactive = false)
+{
+	global $all_items;
+
+	$sql = "SELECT id, role, inactive FROM ".TB_PREF."security_roles";
+
+return combo_input($name, $selected_id, $sql, 'id', 'description',
+	array(
+		'spec_option'=>$new_item ? _("New role") : false,
+		'spec_id' => '',
+		'select_submit'=> $submit_on_change,
+		'show_inactive' => $show_inactive
+	) );
+}
+
+function security_roles_list_cells($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false,
+	$show_inactive = false)
+{
+	if ($label != null)
+		echo "<td>$label</td>\n";
+	echo "<td>";
+	$str = security_roles_list($name, $selected_id, $new_item, $submit_on_change, $show_inactive);
+	echo "</td>\n";
+	return $str;
+}
+
+function security_roles_list_row($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false,
+	$show_inactive = false)
+{
+	echo "<tr>";
+	$str = security_roles_list_cells($label, $name, $selected_id, $new_item, $submit_on_change, $show_inactive);
+	echo "</tr>\n";
+	return $str;
+}
+
+function tab_list_row($label, $name, $selected_id=null, $all = false)
+{
+	global $installed_extensions;
+	
+	$tabs = array();
+	foreach ($_SESSION['App']->applications as $app) {
+		$tabs[$app->id] = access_string($app->name, true);
+	}
+	if ($all) {	// add also not active ext. modules
+		foreach ($installed_extensions as $ext) {
+			if ($ext['type'] == 'module' && !$ext['active'])
+				$tabs[$ext['tab']] = access_string($ext['title'], true);
+		}
+	}
+	echo "<tr>\n";
+	echo "<td>$label</td><td>\n";
+	array_selector($name, $selected_id, $tabs);
+	echo "</td></tr>\n";
+}
+
+//-----------------------------------------------------------------------------------------------
+
+function tag_list($name, $height, $type, $multi=false, $all=false)
+{
+	// Get tags
+	global $path_to_root;
+	include_once($path_to_root . "/admin/db/tags_db.inc");
+	$results = get_tags($type,$all);
+
+	while ($tag = db_fetch($results))
+		$tags[$tag['id']] = $tag['name'];
+	
+	if (!isset($tags)) {
+		$tags[''] = _("No ".($all?"":"active ")."tags defined.");
+	}
+	return array_selector($name, null, $tags,
+		array(
+			'multi' => $multi,
+			'height' => $height,
+		) );
+}
+
+function tag_list_cells($label, $name, $height, $type, $mult=false, $all=false)
+{
+	if ($label != null)
+		echo "<td>$label</td>\n";
+	echo "<td>\n";
+	tag_list($name, $height, $type, $mult, $all);
+	echo "</td>\n";
+	
+}
+
+function tag_list_row($label, $name, $height, $type, $mult=false, $all=false)
+{
+	echo "<tr>\n";
+	tag_list_cells($label, $name, $height, $type, $mult, $all);
+	echo "</tr>\n";	
+}
+
+//---------------------------------------------------------------------------------------------
+//	List of sets of active extensions 
+//
+function extset_list($name, $value=null, $submit_on_change=false)
+{
+	global $db_connections;
+
+	$items = array();
+	foreach ($db_connections as $comp)
+		$items[] = sprintf(_("Activated for '%s'"), $comp['name']);
+	array_selector( $name, $value, $items,
+		array(
+			'spec_option'=> _("Installed on system"),
+			'spec_id' => -1,
+			'select_submit'=> $submit_on_change,
+			'async' => true
+		));
+}
 
 ?>
\ No newline at end of file