X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=7835f33905bbef4d64bd11b4bb774cae71af5e1f;hb=cc36638b65572da4867b7622723d6ed0135525b8;hp=4498a1bded5fbeb555cef6abf59991a457231ee5;hpb=80e6e9ca91b695677c5e7ebc5c4569c5e0b698e0;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 4498a1bd..7835f339 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
@@ -53,6 +52,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
@@ -208,7 +208,9 @@ $opts = array(		// default options
  		$txt = $found;
 		$Ajax->addUpdate($name, $search_box, $txt ? $txt : '');
 	}
-	$selector = "<select $disabled name='$name' class='$class' title='"
+	$selector = "<select ".(strpos($name,'[]')!==false ? "multiple" : '')
+		. ($opts['height']!==false ? ' size="'.$opts['height'].'"' : '')
+		. "$disabled name='$name' class='$class' title='"
 		. $opts['sel_hint']."' $rel>".$selector."</select>\n";
 
 	$Ajax->addUpdate($name, "_{$name}_sel", $selector);
@@ -275,6 +277,7 @@ $opts = array(		// default options
 	'async' => true,	// select update via ajax (true) vs _page_body reload
 	'default' => '', // default value when $_POST is not set
 		// search box parameters
+	'height' => false,	// number of lines in select box
 	'sel_hint' => null,
 	'disabled' => false
 );
@@ -329,7 +332,9 @@ $opts = array(		// default options
 	}
 	$_POST[$name] = $selected_id;
 
-	$selector = "<select $disabled name='$name' class='combo' title='"
+	$selector = "<select ".(strpos($name,'[]')!==false ? "multiple" : '')
+		. ($opts['height']!==false ? ' size="'.$opts['height'].'"' : '')
+		. "$disabled name='$name' class='combo' title='"
 		. $opts['sel_hint']."'>".$selector."</select>\n";
 
 	$Ajax->addUpdate($name, "_{$name}_sel", $selector);
@@ -376,6 +381,7 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
 	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,
@@ -425,6 +431,7 @@ function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_
 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,
@@ -477,6 +484,7 @@ function customer_branches_list($customer_id, $name, $selected_id=null,
 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,
@@ -927,7 +935,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,
 	) );
@@ -964,7 +972,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,
 	) );
@@ -1017,7 +1025,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)
@@ -1041,7 +1050,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)
@@ -1415,6 +1425,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";
 
@@ -1650,15 +1661,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)
@@ -1680,18 +1685,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 ) );
 }
@@ -1718,13 +1719,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 ) );
 }
 
@@ -1815,12 +1812,8 @@ 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
@@ -1838,11 +1831,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( 
@@ -1950,7 +1944,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)
@@ -2138,5 +2132,23 @@ function tab_list_row($label, $name, $selected_id=null)
 	echo "</td></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