user_list_cells Real name shows empty when not entered in user table. @kvvaradha.
[fa-stable.git] / includes / ui / ui_lists.inc
index 1c08e25cf399a2b80933eb88fcc2f1c335d58105..8e4da29d0f467e6e59cf4874cc9b8a532661fd91 100644 (file)
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    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");
+
+define('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")."'> ");
+
+define('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")."'> ");
+
+//----------------------------------------------------------------------------
+//     Universal sql combo generator
+//     $sql must return selector values and selector texts in columns 0 & 1
+//     Options are merged with defaults.
+
+function combo_input($name, $selected_id, $sql, $valfield, $namefield,
+       $options=null, $type=null)
+{
+global $Ajax, $path_to_root, $SysPrefs ;
+
+$opts = array(         // default options
+       'where'=> array(),              // additional constraints
+       'order' => $namefield,  // list sort order
+               // special option parameters
+       'spec_option'=>false,   // option text or false
+       '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
+       'sel_hint' => null,
+       'search_box' => false,  // name or true/false
+       'type' => 0,    // type of extended selector:
+               // 0 - with (optional) visible search box, search by fragment inside id
+               // 1 - with hidden search box, search by option text
+               // 2 - with (optional) visible search box, search by fragment at the start of id
+               // 3 - TODO reverse: box with hidden selector available via enter; this
+               // would be convenient for optional ad hoc adding of new item
+       '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
+       'disabled' => false,
+       'box_hint' => null, // box/selectors hints; null = std see below
+       'category' => false, // category column name or false
+       'show_inactive' => false, // show inactive records. 
+       'editable' => false, // false, or length of editable entry field
+       'editlink' => false     // link to entity entry/edit page (optional)
+);
+// ------ merge options with defaults ----------
+       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'];
+       // select content filtered by search field:
+       $search_submit = $opts['search_submit']===true ? '_'.$name.'_button' : $opts['search_submit'];
+       // select set by select content field
+       $search_button = $opts['editable'] ? '_'.$name.'_button' : ($search_box ? $search_submit : false);
+
+       $select_submit =  $opts['select_submit'];
+       $spec_id = $opts['spec_id'];
+       $spec_option = $opts['spec_option'];
+       if ($opts['type'] == 0) {
+               $by_id = true;
+               $class = 'combo';
+       } elseif($opts['type'] == 1) {
+               $by_id = false;
+               $class = 'combo2';
+       } else {
+               $by_id = true;
+               $class = 'combo3';
+       }
 
-define("DEFVAL", "--");
-$search_button = "<input type='submit' class='combo_submit' style='border:0;background:url($path_to_root/themes/default/images/locate.png) no-repeat;' name='%s' value='?' title='"._("Search")."'> ";
-//$search_button = "<input type='submit' class='inputsubmit' name='%s' value='?'> ";
-
-$all_items = reserved_words::get_all();
-
-// TDB for all list functions : if there is no data, display a link to the releveant
-// page to add an item, eg. for locations, if no locations, link to Add Location
-
-function supplier_list($name, $selected_id, $all_option=false, $submit_on_change=false)
-{
-       global $all_items;
+       $disabled = $opts['disabled'] ? "disabled" : '';
+       $multi = $opts['multi'];
+       
+       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');
 
-       default_focus($name);
-       if ($selected_id == null)
-               $selected_id = ((!isset($_POST[$name]) || $_POST[$name] == "") ? "" : $_POST[$name]);
+       if ($opts['box_hint'] === null)
+               $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, (string)$opts['default']);
+       }
+       if(!is_array($selected_id))
+               $selected_id = array((string)$selected_id); // code is generalized for multiple selection support
 
-       $supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ";
-       if (get_company_pref('no_supplier_list'))
-       {
-               global $search_button;
-               $edit_name = $name."_edit";
-               $edit_button = $name."_button";
+       $txt = get_post($search_box);
+       $rel = '';
+       $limit = '';
+       if (isset($_POST['_'.$name.'_update'])) { // select list or search box change
+               if ($by_id) $txt = $_POST[$name];
 
-               $val = (isset($_POST[$edit_name]) && $_POST[$edit_name] != "" ? $_POST[$edit_name] : "");
-               if (isset($_POST[$edit_button]))
-               {
-                       $selected_id = $_POST[$name] = "";
-                       set_focus($name);
+               if (!$opts['async'])
+                       $Ajax->activate('_page_body');
+               else
+                       $Ajax->activate($name);
+       }
+       if (isset($_POST[$search_button])) {
+               if (!$opts['async'])
+                       $Ajax->activate('_page_body');
+               else
+                       $Ajax->activate($name);
+       }
+       if ($search_box) {
+               // search related sql modifications
+
+               $rel = "rel='$search_box'"; // set relation to list
+               if ($opts['search_submit']) {
+                       if (isset($_POST[$search_button])) {
+                               $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 == array())
+                                       $limit = ' LIMIT 1';
+                               else
+                                       $opts['where'][] = $valfield . "=". db_escape(get_post($name, $spec_id));
+                       }
+                       else
+                               if ($txt != '*') {
+
+                                       foreach($opts['search'] as $i=> $s)
+                                               $opts['search'][$i] = $s . " LIKE "
+                                                       .db_escape(($class=='combo3' ? '' : '%').$txt.'%');
+                                       $opts['where'][] = '('. implode($opts['search'], ' OR ') . ')';
+                               }
                }
+       }
 
-               if ($selected_id != "")
-               {
-                       $val = DEFVAL;
-                       $supplier_sql .= "WHERE supplier_id=$selected_id";
-               }
-               elseif ($val != "" && $val != DEFVAL)
-               {
-                       $supplier_sql .= "WHERE supp_name LIKE '%{$val}%' ORDER BY supp_name";
+       // sql completion
+       if (count($opts['where'])) {
+               $where = strpos($sql, 'WHERE')==false ? ' WHERE ':' AND ';
+               $where .= '('. implode($opts['where'], ' AND ') . ')';
+               $group_pos = strpos($sql, 'GROUP BY');
+               if ($group_pos) {
+                       $group = substr($sql, $group_pos);
+                       $sql = substr($sql, 0, $group_pos) . $where.' '.$group;
+               } else {
+                       $sql .= $where;
                }
-               else
-                       $supplier_sql .= "ORDER BY supp_name LIMIT 1";
-
-               echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
+       }
+       if ($opts['order'] != false) {
+               if (!is_array($opts['order']))
+                       $opts['order'] = array($opts['order']);
+               $sql .= ' ORDER BY '.implode(',',$opts['order']);
+       }
 
-               echo sprintf($search_button, $edit_button);
+       $sql .= $limit;
+       // ------ make selector ----------
+       $selector = $first_opt = '';
+       $first_id = false;
+       $found = false;
+       $lastcat = null;
+       $edit = false;
+       $pname = false;
+       if (($type === "customer" || $type === "supplier") && !empty($SysPrefs->prefs['shortname_name_in_list']))
+               $pname = true;
+       if($result = db_query($sql)) {
+               while ($contact_row = db_fetch($result)) {
+                       $value = $contact_row[0];
+                       $descr = $opts['format']==null ?  $contact_row[1] :
+                               call_user_func($opts['format'], $contact_row, $pname);
+                       $sel = '';
+                       if (get_post($search_button) && ($txt == $value)) {
+                               $selected_id[] = $value;
+                       }
+
+                       if (in_array((string)$value, $selected_id, true)) {
+                               $sel = 'selected';
+                               $found = $value;
+                               $edit = $opts['editable'] && $contact_row['editable'] 
+                                       && (@$_POST[$search_box] == $value)
+                                       ? $contact_row[1] : false; // get non-formatted description
+                               if ($edit)
+                                       break;  // selected field is editable - abandon list construction
+                       }
+                       // show selected option even if inactive 
+                       if (!$opts['show_inactive'] && @$contact_row['inactive'] && $sel==='') {
+                               continue;
+                       } else 
+                               $optclass = @$contact_row['inactive'] ? "class='inactive'" : '';
+
+                       if ($first_id === false) {
+                               $first_id = $value;
+                               $first_opt = $descr;
+                       }
+                       $cat = $contact_row[$opts['category']];
+                       if ($opts['category'] !== false && $cat != $lastcat){
+                               if ($lastcat!==null)
+                                       $selector .= "</optgroup>";
+                               $selector .= "<optgroup label='".$cat."'>\n";
+                               $lastcat = $cat;
+                       }
+                       $selector .= "<option $sel $optclass value='$value'>$descr</option>\n";
+               }
+               if ($lastcat!==null)
+                       $selector .= "</optgroup>";
+               db_free_result($result);
        }
-       else
-               $supplier_sql .= "ORDER BY supp_name";
 
-       $supplier_result = db_query($supplier_sql);
+       // 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' : '';
+               $optclass = @$contact_row['inactive'] ? "class='inactive'" : '';
+               $selector = "<option $sel value='$first_id'>$first_opt</option>\n"
+                       . $selector;
+       }
 
-       if ($submit_on_change==true)
-               echo "<select name='$name' onchange='this.form.submit();'>";
+       if ($found===false) {
+               $selected_id = array($first_id);
+       }
+       
+       $_POST[$name] = $multi ? $selected_id : $selected_id[0];
+
+       if ($SysPrefs->use_popup_search)
+               $selector = "<select id='$name' autocomplete='off' ".($multi ? "multiple" : '')
+               . ($opts['height']!==false ? ' size="'.$opts['height'].'"' : '')
+               . "$disabled name='$name".($multi ? '[]':'')."' class='$class' title='"
+               . $opts['sel_hint']."' $rel>".$selector."</select>\n";
        else
-               echo "<select name='$name'>";
+               $selector = "<select autocomplete='off' ".($multi ? "multiple" : '')
+               . ($opts['height']!==false ? ' size="'.$opts['height'].'"' : '')
+               . "$disabled name='$name".($multi ? '[]':'')."' class='$class' title='"
+               . $opts['sel_hint']."' $rel>".$selector."</select>\n";
+       if ($by_id && ($search_box != false || $opts['editable']) ) {
+               // on first display show selector list
+               if (isset($_POST[$search_box]) && $opts['editable'] && $edit) {
+                       $selector = "<input type='hidden' name='$name' value='".$_POST[$name]."'>"
+                       ."<input type='text' $disabled name='{$name}_text' id='{$name}_text' size='".
+                               $opts['editable']."' maxlength='".$opts['max']."' $rel value='$edit'>\n";
+                               set_focus($name.'_text'); // prevent lost focus
+               } else if (get_post($search_submit ? $search_submit : "_{$name}_button"))
+                       set_focus($name); // prevent lost focus
+               if (!$opts['editable'])
+                       $txt = $found;
+               $Ajax->addUpdate($name, $search_box, $txt ? $txt : '');
+       }
 
-       $company_currency = get_company_currency();
+       $Ajax->addUpdate($name, "_{$name}_sel", $selector);
 
-       if ($all_option == true)
-       {
-       if ($selected_id == $all_items)
-       {
-            echo "<option selected value='$all_items'>" . _("All Suppliers") . "</option>\n";
-       }
-       else
-       {
-            echo "<option value='$all_items'>" . _("All Suppliers") . "</option>\n";
-       }
-               if ($selected_id == "")
-               {
-                       $selected_id = $all_items;
-                       $_POST[$name] = $selected_id;
+       // span for select list/input field update
+       $selector = "<span id='_{$name}_sel'>".$selector."</span>\n";
+
+        // if selectable or editable list is used - add select button
+       if ($select_submit != false || $search_button) {
+       // button class selects form reload/ajax selector update
+               $selector .= sprintf(SELECT_BUTTON, $disabled, user_theme(),
+                       (fallback_mode() ? '' : 'display:none;'),
+                        '_'.$name.'_update')."\n";
+       }
+// ------ make combo ----------
+       $edit_entry = '';
+       if ($search_box != false) {
+               $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']."'"
+                       .(!fallback_mode() && !$by_id ? " style=display:none;":'')
+                       .">\n";
+               if ($search_submit != false || $opts['editable']) {
+                       $edit_entry .= sprintf(SEARCH_BUTTON, $disabled, user_theme(),
+                               (fallback_mode() ? '' : 'display:none;'),
+                               $search_submit ? $search_submit : "_{$name}_button")."\n";
                }
        }
+       default_focus(($search_box && $by_id) ? $search_box : $name);
 
-       while ($supplier_row = db_fetch_row($supplier_result))
+       $img = "";
+       if ($SysPrefs->use_popup_search && (!isset($opts['fixed_asset']) || !$opts['fixed_asset']))
        {
-               if ($selected_id==$supplier_row[0])
-               {
-                       echo "<option selected value='" . $supplier_row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $supplier_row[0] . "'>";
-               }
-               echo $supplier_row[1];
-
-               if ($supplier_row[2] != $company_currency)
-                       echo "&nbsp;-&nbsp;" . $supplier_row[2];
-               echo  "</option>\n";
-               if ($selected_id == "")
-               {
-                       $selected_id = $supplier_row[0];
-                       $_POST[$name] = $selected_id;
-               }
+               $img_title = "";
+               $link = "";
+               $id = $name;
+               if ($SysPrefs->use_popup_windows) {
+               switch (strtolower($type)) {
+                       case "stock":
+                               $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=all&client_id=" . $id;
+                               $img_title = _("Search items");
+                               break;
+                       case "stock_manufactured":
+                               $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=manufactured&client_id=" . $id;
+                               $img_title = _("Search items");
+                               break;
+                       case "stock_purchased":
+                               $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=purchasable&client_id=" . $id;
+                               $img_title = _("Search items");
+                               break;
+                       case "stock_sales":
+                               $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=sales&client_id=" . $id;
+                               $img_title = _("Search items");
+                               break;
+                       case "stock_costable":
+                               $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=costable&client_id=" . $id;
+                               $img_title = _("Search items");
+                               break;
+                       case "component":
+                               $parent = $opts['parent'];
+                               $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=component&parent=".$parent."&client_id=" . $id;
+                               $img_title = _("Search items");
+                               break;
+                       case "kits":
+                               $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=kits&client_id=" . $id;
+                               $img_title = _("Search items");
+                               break;
+                       case "customer":
+                               $link = $path_to_root . "/sales/inquiry/customers_list.php?popup=1&client_id=" . $id;
+                               $img_title = _("Search customers");
+                               break;
+                       case "branch":
+                               $link = $path_to_root . "/sales/inquiry/customer_branches_list.php?popup=1&client_id=" . $id . "#customer_id";
+                               $img_title = _("Search branches");
+                               break;
+                       case "supplier":
+                               $link = $path_to_root . "/purchasing/inquiry/suppliers_list.php?popup=1&client_id=" . $id;
+                               $img_title = _("Search suppliers");
+                               break;
+                       case "account":
+                       case "account2":
+                               $skip = strtolower($type) == "account" ? false : true;
+                               $link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&skip=".$skip."&client_id=" . $id;
+                               $img_title = _("Search GL accounts");
+                               break;
+               }
+               }
+
+               if ($link !=="") {
+               $theme = user_theme();
+               $img = '<img src="'.$path_to_root.'/themes/'.$theme.'/images/'.ICON_VIEW.
+                       '" style="vertical-align:middle;width:12px;height:12px;border:0;" onclick="javascript:lookupWindow(&quot;'.
+                       $link.'&quot;, &quot;&quot;);" title="' . $img_title . '" style="cursor:pointer;" />';
+               }
        }
 
-       echo "</select>";
+       if ($opts['editlink'])
+               $selector .= ' '.$opts['editlink'];
 
-       db_free_result($supplier_result);
+       if ($search_box && $opts['cells'])
+               $str = ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector$img</td>";
+       else
+               $str = $edit_entry.$selector.$img;
+       return $str;
 }
 
-function supplier_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+/*
+       Helper function.
+       Returns true if selector $name is subject to update.
+*/
+function list_updated($name)
 {
-       if ($label != null)
-               echo "<td>$label</td>\n";
-       echo "<td nowrap>";
-       supplier_list($name, $selected_id, $all_option, $submit_on_change);
-       echo "</td>\n";
+       return isset($_POST['_'.$name.'_update']) || isset($_POST['_'.$name.'_button']);
 }
+//----------------------------------------------------------------------------------------------
+//     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
+       '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'];
+       $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((string)$selected_id); // code is generalized for multiple selection support
 
-function supplier_list_row($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
-{
-       echo "<tr>\n";
-       supplier_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
-       echo "</tr>\n";
-}
+       if (isset($_POST[ '_'.$name.'_update'])) {
+               if (!$opts['async'])
+                       $Ajax->activate('_page_body');
+               else
+                       $Ajax->activate($name);
+       }
 
-//----------------------------------------------------------------------------------------------
+       // ------ make selector ----------
+       $selector = $first_opt = '';
+       $first_id = false;
+       $found = false;
+       foreach($items as $value=>$descr) {
+               $sel = '';
+               if (in_array((string)$value, $selected_id, true)) {
+                       $sel = 'selected';
+                       $found = $value;
+               }
+               if ($first_id === false) {
+                       $first_id = $value;
+                       $first_opt = $descr;
+               }
+               $selector .= "<option $sel value='$value'>$descr</option>\n";
+       }
 
-function customer_list($name, $selected_id, $all_option=false, $submit_on_change=false)
-{
-       global $all_items;
+       if ($first_id!==false) {
+               $sel = ($found===$first_id) || ($found===false && ($spec_option===false)) ? "selected='selected'" : '';
+       }
+       // 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;
+       }
 
-       default_focus($name);
-       if ($selected_id == null)
-               $selected_id = ((!isset($_POST[$name]) || $_POST[$name] == "") ? "" : $_POST[$name]);
+       if ($found===false) {
+               $selected_id = array($first_id);
+       }
+       $_POST[$name] = $multi ? $selected_id : $selected_id[0];
 
-       $customer_sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ";
-       if (get_company_pref('no_customer_list'))
-       {
-               global $search_button;
-               $edit_name = $name."_edit";
-               $edit_button = $name."_button";
+       $selector = "<select autocomplete='off' ".($multi  ? "multiple" : '')
+               . ($opts['height']!==false ? ' size="'.$opts['height'].'"' : '')
+               . "$disabled name='$name".($multi ? '[]' : '')."' class='combo' title='"
+               . $opts['sel_hint']."'>".$selector."</select>\n";
 
-               $val = (isset($_POST[$edit_name]) && $_POST[$edit_name] != "" ? $_POST[$edit_name] : "");
-               if (isset($_POST[$edit_button]))
-               {
-                       $selected_id = $_POST[$name] = "";
-                       $_POST['branch_id'] = "";
-                       set_focus($name);
-               }
-               if ($selected_id != "")
-               {
-                       $val = DEFVAL;
-                       $customer_sql .= "WHERE debtor_no=$selected_id";
-               }
-               elseif ($val != "" && $val != DEFVAL)
-               {
-                       $customer_sql .= "WHERE name LIKE '%{$val}%' ORDER BY name";
-               }
-               else
-                       $customer_sql .= "ORDER BY name LIMIT 1";
-               echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
+       $Ajax->addUpdate($name, "_{$name}_sel", $selector);
 
-               echo sprintf($search_button, $edit_button);
-       }
-       else
-               $customer_sql .= "ORDER BY name";
+       $selector = "<span id='_{$name}_sel'>".$selector."</span>\n";
 
-       $customer_result = db_query($customer_sql);
+       if ($select_submit != false) { // if submit on change is used - add select button
+               $selector .= sprintf(SELECT_BUTTON, $disabled, user_theme(),
+                       (fallback_mode() ? '' : 'display:none;'),
+                        '_'.$name.'_update')."\n";
+       }
+       default_focus($name);
 
-       if ($submit_on_change==true)
-               echo "<select name='$name' onchange='this.form.submit();'>";
-       else
-               echo "<select name='$name'>";
+       return $selector;
+}
+//----------------------------------------------------------------------------------------------
+function array_selector_row($label, $name, $selected_id, $items, $options=null)
+{
+       echo "<tr><td class='label'>$label</td>\n<td>";
+       echo array_selector($name, $selected_id, $items, $options);
+       echo "</td></tr>\n";
+}
 
-       $company_currency = get_company_currency();
+//----------------------------------------------------------------------------------------------
+function _format_add_curr($row, $pname=false)
+{
+       static $company_currency;
 
-       if (($all_option == true))
+       if ($company_currency == null)
        {
-       if ($selected_id == $all_items)
-       {
-            echo "<option selected value='$all_items'>" . _("All Customers") . "</option>\n";
-       }
-       else
-       {
-            echo "<option value='$all_items'>" . _("All Customers") . "</option>\n";
-       }
-               if ($selected_id == "")
-               {
-                       $selected_id =  $all_items;
-                       $_POST[$name] = $selected_id;
-               }
+               $company_currency = get_company_currency();
        }
-       while ($customer_row = db_fetch_row($customer_result))
+       if (!$pname)
        {
-               if ($selected_id == $customer_row[0])
-               {
-                       echo "<option selected value='" . $customer_row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $customer_row[0] . "'>";
-               }
+               return $row[1] . ($row[2] == $company_currency ? '' : ("&nbsp;-&nbsp;" . $row[2]));
+       }               
+       else
+       {
+               return $row[1] . "&nbsp;-&nbsp;" . $row[2] . ($row[3] == $company_currency ? '' : ("&nbsp;-&nbsp;" . $row[3]));
+       }               
+}
 
-               echo $customer_row[1];
-               if ($customer_row[2] != $company_currency)
-                       echo "&nbsp;-&nbsp;" . $customer_row[2];
+function add_edit_combo($type)
+{
+       global $path_to_root, $popup_editors, $SysPrefs;
 
-               echo  "</option>\n";
-               // if no initial selection - set the first item
-               // do we want to do this for all lists ???? probably
-               if ($selected_id == "")
-               {
-                       $selected_id = $customer_row[0];
-                       $_POST[$name] = $selected_id;
-               }
-       }
+       if (!isset($SysPrefs->use_icon_for_editkey) || $SysPrefs->use_icon_for_editkey==0)
+               return "";
+       // Derive theme path
+       $theme_path = $path_to_root . '/themes/' . user_theme();
+
+       $key = $popup_editors[$type][1];
+       $onclick = "onclick=\"javascript:callEditor($key); return false;\"";
+       $img = "<img width='12' height='12' border='0' alt='Add/Edit' title='Add/Edit' src='$theme_path/images/".ICON_EDIT."'>";
+       return "<a target = '_blank' href='#' $onclick tabindex='-1'>$img</a>"; 
+}
 
-       echo "</select>";
-       db_free_result($customer_result);
+function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
+       $all=false, $editkey = false)
+{
+       global $SysPrefs;
+       if (!empty($SysPrefs->prefs['shortname_name_in_list']))
+               $sql = "SELECT supplier_id, supp_ref, supp_name, curr_code, inactive FROM ".TB_PREF."suppliers ";
+       else    
+               $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);
+
+       $ret = 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,
+        'search' => array("supp_ref","supp_name","gst_no"),        
+               'spec_option' => $spec_option === true ? _("All Suppliers") : $spec_option,
+               'spec_id' => ALL_TEXT,
+               'select_submit'=> $submit_on_change,
+               'async' => false,
+               'sel_hint' => $mode ? _('Press Space tab to filter by name fragment') :
+               _('Select supplier'),
+               'show_inactive'=>$all,
+               'editlink' => $editkey ? add_edit_combo('supplier') : false
+               ), "supplier");
+       return $ret;
 }
 
-function customer_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, $all=false, $editkey = false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
-       echo "<td nowrap>";
-       customer_list($name, $selected_id, $all_option, $submit_on_change);
+       echo "<td>";    
+       echo supplier_list($name, $selected_id, $all_option, $submit_on_change, 
+               $all, $editkey);
        echo "</td>\n";
 }
 
-function customer_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, $all=false, $editkey = false)
 {
-       echo "<tr>\n";
-       customer_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
-       echo "</tr>\n";
+       echo "<tr><td class='label'>$label</td><td>";
+       echo supplier_list($name, $selected_id, $all_option, $submit_on_change,
+               $all, $editkey);
+       echo "</td></tr>\n";
 }
+//----------------------------------------------------------------------------------------------
 
-//------------------------------------------------------------------------------------------------
-
-function customer_branches_list($customer_id, $name, $selected_id,
-       $all_option = true, $enabled=true, $submit_on_change=false)
+function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, 
+       $show_inactive=false, $editkey = false)
+{
+       global $SysPrefs;
+       if (!empty($SysPrefs->prefs['shortname_name_in_list']))
+               $sql = "SELECT debtor_no, debtor_ref, name, curr_code, inactive FROM ".TB_PREF."debtors_master ";
+       else    
+               $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);
+
+       $ret = combo_input($name, $selected_id, $sql, 'debtor_no', 'debtor_ref',
+       array(
+           'format' => '_format_add_curr',
+           'order' => array('debtor_ref'),
+               'search_box' => $mode!=0,
+               'type' => 1,
+               'size' => 20,
+        'search' => array("debtor_ref","name","tax_id"),        
+               'spec_option' => $spec_option === true ? _("All Customers") : $spec_option,
+               'spec_id' => ALL_TEXT,
+               'select_submit'=> $submit_on_change,
+               'async' => false,
+               'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F2 - entry new customer') :
+               _('Select customer'),
+               'show_inactive' => $show_inactive,
+               'editlink' => $editkey ? add_edit_combo('customer') : false
+       ), "customer" );
+       return $ret;
+}
+
+function customer_list_cells($label, $name, $selected_id=null, $all_option=false, 
+       $submit_on_change=false, $show_inactive=false, $editkey = false)
 {
-       global $all_items;
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td nowrap>";
+       echo customer_list($name, $selected_id, $all_option, $submit_on_change,
+               $show_inactive, $editkey);
+       echo "</td>\n";
+}
 
-       default_focus($name);
-       if ($submit_on_change==true)
-               echo "<select name='$name' onchange='this.form.submit();'>";
-       else
-               echo "<select name='$name'>";
+function customer_list_row($label, $name, $selected_id=null, $all_option = false, 
+       $submit_on_change=false, $show_inactive=false, $editkey = false)
+{
 
-       $sql = "SELECT branch_code, br_name FROM ".TB_PREF."cust_branch
-               WHERE debtor_no='" . $customer_id . "'";
-       if ($enabled)
-               $sql .= " AND disable_trans = 0";
-       $result = db_query($sql);
+       echo "<tr><td class='label'>$label</td><td nowrap>";
+       echo customer_list($name, $selected_id, $all_option, $submit_on_change,
+               $show_inactive, $editkey);
+       echo "</td>\n</tr>\n";
+}
 
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       if ($all_option == true)
-       {
-               echo "<option ";
-               if ($selected_id == $all_items)
-                       echo " selected ";
-               echo "value='$all_items'>" . _("All Branches") . "</option>\n";
+//------------------------------------------------------------------------------------------------
 
-               if ($selected_id == "")
-               {
-                       $selected_id =  $all_items;
-               }
-       }
+function customer_branches_list($customer_id, $name, $selected_id=null,
+       $spec_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
+{
 
-       while ($row = db_fetch_row($result))
-       {
-               if ($selected_id == $row[0])
-               {
-                       echo "<option selected value='" . $row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $row[0] . "'>";
-               }
-               echo $row[1] . "</option>\n";
+       $sql = "SELECT branch_code, branch_ref FROM ".TB_PREF."cust_branch
+               WHERE debtor_no=" . db_escape($customer_id)." ";
 
-               if ($selected_id == "")
-               {
-                       $selected_id = $row[0];
-                       $_POST[$name] = $selected_id;
-               }
-       }
+       if ($editkey)
+               set_editor('branch', $name, $editkey);
 
-       echo "</select>";
-       db_free_result($result);
+       $where = $enabled ? array("inactive = 0") : array();
+       $ret = combo_input($name, $selected_id, $sql, 'branch_code', 'branch_ref',
+       array(
+               'where' => $where,
+               'order' => array('branch_ref'),
+               'spec_option' => $spec_option === true ? _('All branches') : $spec_option,
+               'spec_id' => ALL_TEXT,
+               'select_submit'=> $submit_on_change,
+               'sel_hint' => _('Select customer branch'),
+               'editlink' => $editkey ? add_edit_combo('branch') : false
+       ), "branch" );
+       return $ret;
 }
+//------------------------------------------------------------------------------------------------
 
-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, $editkey = false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
+       echo customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled, 
+               $submit_on_change, $editkey);
        echo "</td>\n";
 }
 
-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, $editkey = false)
 {
-       echo "<tr>";
-       customer_branches_list_cells($label, $customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
+       echo "<tr><td class='label'>$label</td>";
+       customer_branches_list_cells(null, $customer_id, $name, $selected_id, 
+               $all_option, $enabled, $submit_on_change, $editkey);
        echo "</tr>";
 }
 
 //------------------------------------------------------------------------------------------------
 
-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, $fixed_asset=false)
 {
-       global $all_items;
-
-       default_focus($name);
-       if ($submit_on_change == true)
-               echo "<select name='$name' onchange='this.form.submit();'>";
-       else
-               echo "<select name='$name'>";
 
-//     if ($selected_id =="" AND isset($_SESSION['UserStockLocation']) AND $_SESSION['UserStockLocation'] !="") {
-//             $selected_id = $_SESSION['UserStockLocation'];
-//     }
+       $sql = "SELECT loc_code, location_name, inactive FROM ".TB_PREF."locations WHERE fixed_asset=".(int)$fixed_asset;
 
-       $sql = "SELECT loc_code, location_name FROM ".TB_PREF."locations";
-       $result = db_query($sql);
-
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       if ($all_option == true)
-       {
-               echo "<option ";
-       if ($selected_id == $all_items)
-            echo " selected ";
-               echo " value='$all_items'>" . _("All Locations") . "</option>\n";
+       return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name',
+               array(
+                       'spec_option' => $all_option === true ? _("All Locations") : $all_option,
+                       'spec_id' => ALL_TEXT,
+                       'select_submit'=> $submit_on_change
+               ) );
+}
 
-               if ($selected_id == "")
-               {
-                       $selected_id = $all_items;
-               }
-       }
+function locations_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $fixed_asset=false)
+{
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+       echo locations_list($name, $selected_id, $all_option, $submit_on_change, $fixed_asset);
+       echo "</td>\n";
+}
 
-       while ($row = db_fetch_row($result))
-       {
-               if ($selected_id == $row[0])
-               {
-                       echo "<option selected value='" . $row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $row[0] . "'>";
-               }
-               echo $row[1] . "</option>\n";
+function locations_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $fixed_asset=false)
+{
+       echo "<tr><td class='label'>$label</td>";
+       locations_list_cells(null, $name, $selected_id, $all_option, $submit_on_change, $fixed_asset);
+       echo "</tr>\n";
+}
 
-               if ($selected_id == "")
-               {
-                       $selected_id = $row[0];
-                       $_POST[$name] = $selected_id;
-               }
-       }
+//-----------------------------------------------------------------------------------------------
 
-       echo "</select>";
+function currencies_list($name, $selected_id=null, $submit_on_change=false, $exclude_home_curr=false)
+{
+       $sql = "SELECT curr_abrev, currency, inactive FROM ".TB_PREF."currencies";
+       if ($exclude_home_curr)
+               $sql .= " WHERE curr_abrev!='".get_company_currency()."'";
 
-       db_free_result($result);
+       // default to the company currency
+       return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency',
+               array(
+                       'select_submit'=> $submit_on_change,
+                       'default' => get_company_currency(),
+                       'async' => false
+               ) );
 }
 
-function locations_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function currencies_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       locations_list($name, $selected_id, $all_option, $submit_on_change);
+       echo currencies_list($name, $selected_id, $submit_on_change);
        echo "</td>\n";
 }
 
-function locations_list_row($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function currencies_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
-       echo "<tr>";
-       locations_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
+       echo "<tr><td class='label'>$label</td>";
+       currencies_list_cells(null, $name, $selected_id, $submit_on_change);
        echo "</tr>\n";
 }
 
-//-----------------------------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------------
 
-function currencies_list($name, &$selected_id, $submit_on_change=false)
+function fiscalyears_list($name, $selected_id=null, $submit_on_change=false)
 {
-       default_focus($name);
-       if ($submit_on_change==true)
-               echo "<select name='$name' onchange='this.form.submit();'>";
-       else
-               echo "<select name='$name'>";
-
-       $company_currency = get_company_currency();
 
-       $sql = "SELECT curr_abrev, currency FROM ".TB_PREF."currencies";
-       $result = db_query($sql);
+       $sql = "SELECT * FROM ".TB_PREF."fiscal_year";
 
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       while ($row = db_fetch_row($result))
-       {
-               // default to the company currency
-               if ($selected_id == "" && ($row[0] == $company_currency))
-               {
-                       $selected_id = $row[0];
-                       $_POST[$name] = $selected_id;
-               }
+       // default to the company current fiscal year
 
-               if ($selected_id == $row[0])
-               {
-                       echo "<option selected value='" . $row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $row[0] . "'>";
-               }
-               echo $row[0] . "&nbsp;-&nbsp;" . $row[1] . "</option>\n";
-       }
+       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
+               ) );
+}
 
-       echo "</select>";
-       db_free_result($result);
+function _format_fiscalyears($row)
+{
+       return sql2date($row[1]) . "&nbsp;-&nbsp;" . sql2date($row[2])
+       . "&nbsp;&nbsp;" . ($row[3] ? _('Closed') : _('Active'));
 }
 
-function currencies_list_cells($label, $name, $selected_id)
+function fiscalyears_list_cells($label, $name, $selected_id=null)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       currencies_list($name, $selected_id);
+       echo fiscalyears_list($name, $selected_id);
        echo "</td>\n";
 }
 
-function currencies_list_row($label, $name, $selected_id)
+function fiscalyears_list_row($label, $name, $selected_id=null)
 {
-       echo "<tr>\n";
-       currencies_list_cells($label, $name, $selected_id);
+       echo "<tr><td class='label'>$label</td>";
+       fiscalyears_list_cells(null, $name, $selected_id);
        echo "</tr>\n";
 }
+//------------------------------------------------------------------------------------
 
-//---------------------------------------------------------------------------------------------------
-
-function fiscalyears_list($name, &$selected_id, $submit_on_change=false)
+function dimensions_list($name, $selected_id=null, $no_option=false, $showname=' ',
+       $submit_on_change=false, $showclosed=false, $showtype=1)
 {
-       default_focus($name);
-       if ($submit_on_change == true)
-               echo "<select name='$name' onchange='this.form.submit();'>";
-       else
-               echo "<select name='$name'>";
-
-       $company_year = get_company_pref('f_year');
-
-       $sql = "SELECT * FROM ".TB_PREF."fiscal_year ORDER BY begin";
-       $result = db_query($sql);
+       $sql = "SELECT id, CONCAT(reference,'  ',name) as ref FROM ".TB_PREF."dimensions";
 
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       while ($row = db_fetch_row($result))
-       {
-               // default to the company current fiscal year
-               if ($selected_id == "" && ($row[0] == $company_year))
-               {
-                       $selected_id = $row[0];
-                       $_POST[$name] = $selected_id;
-               }
+       $options = array(
+               'order' => 'reference',
+               'spec_option'=>$no_option ? $showname : false,
+               'spec_id' => 0,
+               'select_submit'=> $submit_on_change,
+               'async' => false,
+       );
 
-               if ($selected_id == $row[0])
-               {
-                       echo "<option selected value='" . $row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $row[0] . "'>";
-               }
-               if ($row[3] == 0)
-                       $how = _('Active');
-               else
-                       $how = _('Closed');
-               $row[1] = sql2date($row[1]);
-               $row[2] = sql2date($row[2]);
-               echo $row[1] . "&nbsp;-&nbsp;" . $row[2] . "&nbsp;&nbsp;" . $how . "</option>\n";
-       }
+       if (!$showclosed)
+               $options['where'][] = "closed=0";
+       if($showtype)
+               $options['where'][] = "type_=".db_escape($showtype);
 
-       echo "</select>";
-       db_free_result($result);
+       return combo_input($name, $selected_id, $sql, 'id', 'ref', $options);
 }
 
-function fiscalyears_list_cells($label, $name, $selected_id)
+function dimensions_list_cells($label, $name, $selected_id=null, $no_option=false, $showname=null,
+       $showclosed=false, $showtype=0, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       fiscalyears_list($name, $selected_id);
+       echo dimensions_list($name, $selected_id, $no_option, $showname, $submit_on_change, $showclosed, $showtype);
        echo "</td>\n";
 }
 
-function fiscalyears_list_row($label, $name, $selected_id)
+function dimensions_list_row($label, $name, $selected_id=null, $no_option=false, $showname=null,
+       $showclosed=false, $showtype=0, $submit_on_change=false)
 {
-       echo "<tr>\n";
-       fiscalyears_list_cells($label, $name, $selected_id);
+       echo "<tr><td class='label'>$label</td>";
+       dimensions_list_cells(null, $name, $selected_id, $no_option, $showname,
+               $showclosed, $showtype, $submit_on_change);
        echo "</tr>\n";
 }
 
 //---------------------------------------------------------------------------------------------------
 
-function simple_codeandname_list($sql, $name, &$selected_id,
-       $all_option=false, $all_option_name=null, $all_option_numeric=false,
-       $submit_on_change=false, $returnzero=false)
+function stock_items_list($name, $selected_id=null, $all_option=false, 
+       $submit_on_change=false, $opts=array(), $editkey = false, $type = "stock")
 {
-       global $all_items;
+       $sql = "SELECT stock_id, s.description, c.description, s.inactive, s.editable
+                       FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id";
 
-       default_focus($name);
-       if ($submit_on_change == true)
-               echo "<select name='$name' onchange='this.form.submit();'>";
+       if (isset($opts['fixed_asset']) && $opts['fixed_asset'])
+               $sql .= " AND mb_flag='F'";
        else
-               echo "<select name='$name'>";
+               $sql .= " AND mb_flag!='F'";
 
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       if ($all_option == true)
-       {
-               if ($returnzero)
-                       $reserved_word = 0;
-               elseif ($all_option_numeric)
-                       $reserved_word = reserved_words::get_all_numeric();
-               else
-                       $reserved_word = $all_items;
-
-       if ($selected_id == $reserved_word)
-       {
-            echo "<option selected value='$reserved_word'>$all_option_name</option>\n";
-       }
-       else
-       {
-            echo "<option value='$reserved_word'>$all_option_name</option>\n";
-       }
-               if ($selected_id == "")
-               {
-                       $selected_id =  $reserved_word;
-               }
-       }
+       if ($editkey)
+               set_editor('item', $name, $editkey);
 
-       $result = db_query($sql);
+       $ret = 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_TEXT,
+                       'search_box' => true,
+                       'search' => array("stock_id", "c.description","s.description"),
+                       'search_submit' => get_company_pref('no_item_list')!=0 && (!isset($opts['fixed_asset']) || !$opts['fixed_asset']),
+                       'size'=>10,
+                       'select_submit'=> $submit_on_change,
+                       'category' => 2,
+                       'order' => array('c.description','stock_id'),
+                       'editlink' => $editkey ? add_edit_combo('item') : false,
+                       'editable' => false,
+                       'max' => 255
+                 ), $opts), $type );
+       return $ret;
+}
 
-       while ($row = db_fetch_row($result))
-       {
-               if ($selected_id == $row[0])
-               {
-                       echo "<option selected value='" . $row[0] . "'>";
-               } else {
-                       echo "<option value='" . $row[0] . "'>";
-               }
-               echo $row[1] . "</option>\n";
+function _format_stock_items($row)
+{
+       return (user_show_codes() ?  ($row[0] . "&nbsp;-&nbsp;") : "") . $row[1];
+}
 
-               if (!$returnzero && $selected_id == "")
-               {
-                       $selected_id = $row[0];
-                       $_POST[$name] = $selected_id;
-               }
+function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, 
+       $submit_on_change=false, $all=false, $editkey = false, $opts= array())
+{
+       if (isset($opts['fixed_asset']) && $opts['fixed_asset'])
+               $editor_item = 'fa_item';
+       else
+               $editor_item = 'item';
+
+//     if ($editkey) ??
+//             set_editor($editor_item, $name, $editkey);
+
+       if ($label != null)
+               echo "<td>$label</td>\n";
+
+// ??
+//  $opts = array_merge($options, array('cells'=>true, 'show_inactive'=>$all, 'new_icon' => $editkey ? 'item' : false));
+//
+//     echo stock_items_list($name, $selected_id, $all_option, $submit_on_change, $opts);
+
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array_merge(array('cells'=>true, 'show_inactive'=>$all), $opts), $editkey);
+
+}
+/*
+function stock_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+{
+       echo "<tr>\n";
+       stock_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
+       echo "</tr>\n";
+}
+*/
+//---------------------------------------------------------------------------------------------------
+//
+// Select item via foreign code.
+//
+function sales_items_list($name, $selected_id=null, $all_option=false, 
+       $submit_on_change=false, $type='', $opts=array())
+{
+       // all sales codes
+       $sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit,
+                        i.inactive, if(count(*)>1, '0', s.editable) as editable
+                       FROM
+                       ".TB_PREF."stock_master s,
+                       ".TB_PREF."item_codes i
+                       LEFT JOIN
+                       ".TB_PREF."stock_category c
+                       ON i.category_id=c.category_id
+                       WHERE i.stock_id=s.stock_id
+      AND mb_flag != 'F'";
+
+       
+       if ($type == 'local')   { // exclude foreign codes
+               $sql .= " AND !i.is_foreign"; 
+       } elseif ($type == 'kits') { // sales kits
+               $sql .= " AND !i.is_foreign AND i.item_code!=i.stock_id";
        }
+       $sql .= " AND !i.inactive AND !s.inactive AND !s.no_sale";
+       $sql .= " GROUP BY i.item_code";
+
+       return combo_input($name, $selected_id, $sql, 'i.item_code', 'c.description',
+               array_merge(
+                 array(
+                       'format' => '_format_stock_items',
+                       'spec_option' => $all_option===true ?  _("All Items") : $all_option,
+                       'spec_id' => ALL_TEXT,
+                       'search_box' => true,
+                       'search' => array("i.item_code", "c.description", "i.description"),
+                       'search_submit' => get_company_pref('no_item_list')!=0,
+                       'size'=>15,
+                       'select_submit'=> $submit_on_change,
+                       'category' => 2,
+                       'order' => array('c.description','i.item_code'),
+                       'editable' => 30,
+                       'max' => 255
+                 ), $opts), $type == 'kits' ? $type : "stock_sales" );
+}
+
+function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $editkey=false)
+{
+       if ($editkey)
+               set_editor('item', $name, $editkey);
+
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo sales_items_list($name, $selected_id, $all_option, $submit_on_change,
+               '', array('cells'=>true));
+}
 
-       echo "</select>";
-       db_free_result($result);
+function sales_kits_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
+{
+       return sales_items_list($name, $selected_id, $all_option, $submit_on_change,
+               'kits', array('cells'=>false, 'editable' => false));
 }
 
+function sales_local_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+{
+       echo "<tr>";
+       if ($label != null)
+               echo "<td class='label'>$label</td>\n";
+       echo "<td>";
+       echo sales_items_list($name, $selected_id, $all_option, $submit_on_change,
+               'local', array('cells'=>false, 'editable' => false));
+       echo "</td></tr>";
+}
 //------------------------------------------------------------------------------------
 
-function dimensions_list($name, &$selected_id, $no_option=false, $showname=null,
-       $submit_on_change=false, $showclosed=false, $showtype=1)
+function stock_manufactured_items_list($name, $selected_id=null,
+       $all_option=false, $submit_on_change=false)
 {
-       default_focus($name);
-       $sql = "SELECT id, CONCAT(reference,'  ',name) FROM ".TB_PREF."dimensions";
-       if ($showclosed || $showtype)
-       {
-               $sql .= " WHERE";
-               if ($showclosed)
-                       $sql .= " closed=0";
-               if ($showclosed && $showtype)
-                       $sql .= " AND type_=$showtype";
-               else if ($showtype)
-                       $sql .= " type_=$showtype";
-       }
-       $sql .= " ORDER BY reference";
-       simple_codeandname_list($sql, $name, $selected_id, $no_option, $showname,
-               true, $submit_on_change, true);
+       return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array('where'=>array("mb_flag= 'M'")), false, "stock_manufactured");
 }
 
-function dimensions_list_cells($label, $name, $selected_id, $no_option=false, $showname=null,
-       $showclosed=false, $showtype=0)
+function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
+                               $all_option=false, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       dimensions_list($name, $selected_id, $no_option, $showname, false, $showclosed, $showtype);
+       echo stock_manufactured_items_list($name, $selected_id, $all_option, $submit_on_change);
        echo "</td>\n";
 }
 
-function dimensions_list_row($label, $name, $selected_id, $no_option=false, $showname=null,
-       $showclosed=false, $showtype=0)
+function stock_manufactured_items_list_row($label, $name, $selected_id=null,
+               $all_option=false, $submit_on_change=false)
 {
-       echo "<tr>\n";
-       dimensions_list_cells($label, $name, $selected_id, $no_option, $showname,
-               $showclosed, $showtype);
+       echo "<tr><td class='label'>$label</td>";
+       stock_manufactured_items_list_cells(null, $name, $selected_id, $all_option, $submit_on_change);
        echo "</tr>\n";
 }
+//------------------------------------------------------------------------------------
 
-//---------------------------------------------------------------------------------------------------
-
-function stock_items_list($name, $selected_id, $all_option=false, $submit_on_change=false, $extra="")
+function stock_component_items_list($name, $parent_stock_id, $selected_id=null,
+       $all_option=false, $submit_on_change=false, $editkey = false)
 {
-       global $all_items;
+       $parent = db_escape($parent_stock_id);
+       return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array('where'=>array("stock_id != $parent"), 'parent'=> $parent_stock_id), $editkey, "component");
+}
 
-       default_focus($name);
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
 
+function stock_component_items_list_cells($label, $name, $parent_stock_id, 
+       $selected_id=null, $all_option=false, $submit_on_change=false, $editkey = false)
+{
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       $parent = db_escape($parent_stock_id);
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true, 'parent'=> $parent_stock_id), $editkey, "component");
+}
+//------------------------------------------------------------------------------------
 
-       $sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
-                       FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id";
-
-       if (get_company_pref('no_item_list'))
-       {
-               global $search_button;
-               $edit_name = $name."_edit";
-               $edit_button = $name."_button";
-
-               $val = (isset($_POST[$edit_name]) && $_POST[$edit_name] != "" ? $_POST[$edit_name] : "");
-
-               if (isset($_POST[$edit_button]))
-               {
-                       $selected_id = $_POST[$name] = "";
-                       set_focus($name);
-               }
-               if ($selected_id != "")
-               {
-                       $val = DEFVAL;
-                       $sql .= " AND stock_id='$selected_id'";
-               }
-               elseif ($val != "" && $val != DEFVAL)
-               {
-                       $sql .= " AND
-                               (stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
-                               .TB_PREF."stock_master.description LIKE '%{$val}%')";
-               }
-               else
-                       $sql .= " LIMIT 1";
-               echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
-
-               echo sprintf($search_button, $edit_button);
-       }
-       $result = db_query($sql);
-
-
-    echo "<select name='$name'".
-           ($submit_on_change ? " onchange='this.form.submit();'" : '').
-           ($extra=='' ? '' : " $extra").
-       ">";
-
-       if (($all_option == true))
-       {
-       if ($selected_id == $all_items)
-       {
-            echo "<option selected value='$all_items'>" . _("All Items") . "</option>\n";
-       }
-       else
-       {
-            echo "<option value='$all_items'>" . _("All Items") . "</option>\n";
-       }
-               if ($selected_id == "")
-               {
-                       $selected_id = $all_items;
-                       $_POST[$name] = $selected_id;
-               }
-       }
-
-       while ($row = db_fetch_row($result))
-       {
-               if ($selected_id == $row[0])
-               {
-                       echo "<option selected value='" . $row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $row[0] . "'>";
-               }
-               echo (user_show_codes()?$row[0] . "&nbsp;-&nbsp;":"") . $row[2] . "&nbsp;-&nbsp;" . $row[1] . "</option>\n";
-
-               // if no initial selection - set the first item
-               // do we want to do this for all lists ???? probably
-               if ($selected_id == "")
-               {
-                       $selected_id = $row[0];
-                       $_POST[$name] = $selected_id;
-               }
-       }
-       echo "</select>";
-       db_free_result($result);
+function stock_costable_items_list($name, $selected_id=null,
+       $all_option=false, $submit_on_change=false)
+{
+       return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array('where'=>array("mb_flag!='D'")), false, "stock_costable");
 }
 
-function stock_items_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false, $extra="")
+function stock_costable_items_list_cells($label, $name, $selected_id=null, 
+       $all_option=false, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
-       echo "<td nowrap>";
-       stock_items_list($name, $selected_id, $all_option, $submit_on_change, $extra);
-       echo "</td>\n";
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array('where'=>array("mb_flag!='D'"), 'cells'=>true), false, "stock_costable");
 }
 
-function stock_items_list_row($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+//------------------------------------------------------------------------------------
+function stock_purchasable_items_list($name, $selected_id=null,        
+       $all_option=false, $submit_on_change=false, $all=false, $editkey=false)
 {
-       echo "<tr>\n";
-       stock_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
-       echo "</tr>\n";
+       return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array('where'=>array("NOT no_purchase"), 
+                       'show_inactive'=>$all), $editkey, "stock_purchased");
+}
+//
+//     This helper is used in PO/GRN/PI entry and supports editable descriptions.
+//
+function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
+                       $all_option=false, $submit_on_change=false, $editkey=false)
+{
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array('where'=>array("NOT no_purchase"), 
+                        'editable' => 30,
+                        'cells'=>true), $editkey);
 }
 
 //------------------------------------------------------------------------------------
 
-function stock_bom_items_list($name, $selected_id, $all_option=false, $submit_on_change=false)
+function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=true)
 {
-       global $all_items;
-
-       default_focus($name);
-       if ($submit_on_change==true)
-               echo "<select name='$name' onchange='this.form.submit();'>";
-       else
-               echo "<select name='$name'>";
-
-       $sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
-               FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
-               AND (".TB_PREF."stock_master.mb_flag='M' OR ".TB_PREF."stock_master.mb_flag='K')";
-       $result = db_query($sql);
+       global $stock_types;
 
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       if (($all_option == true))
-       {
-       if ($selected_id == $all_items)
-       {
-            echo "<option selected value='$all_items'>" . _("All Items") . "</option>\n";
-       }
-       else
-       {
-            echo "<option value='$all_items'>" . _("All Items") . "</option>\n";
-       }
-               if ($selected_id == "")
-               {
-                       $selected_id = $all_items;
-               }
-       }
-
-       while ($row = db_fetch_row($result))
-       {
-               if ($selected_id==$row[0])
-               {
-                       echo "<option selected value='" . $row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $row[0] . "'>";
-               }
-               echo (user_show_codes()?$row[0] . "&nbsp;-&nbsp;":"") . $row[2] . "&nbsp;-&nbsp;" . $row[1] . "</option>\n";
-
-               if ($selected_id == "")
-               {
-                       $selected_id = $row[0];
-                       $_POST[$name] = $selected_id;
-               }
-       }
+       echo "<tr>";
+       if ($label != null)
+               echo "<td class='label'>$label</td>\n";
+       echo "<td>";
 
-       echo "</select>";
-       db_free_result($result);
+       echo array_selector($name, $selected_id, $stock_types, 
+               array( 
+                       'select_submit'=> true, 
+                       'disabled' => !$enabled) );
+       echo "</td></tr>\n";
 }
 
-function stock_bom_items_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function stock_units_list_row($label, $name, $value=null, $enabled=true)
 {
+       $result = get_all_item_units();
+       echo "<tr>";
        if ($label != null)
-               echo "<td>$label</td>\n";
+               echo "<td class='label'>$label</td>\n";
        echo "<td>";
-       stock_bom_items_list($name, $selected_id, $all_option, $submit_on_change);
-       echo "</td>\n";
-}
 
-function stock_bom_items_list_row($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
-{
-       echo "<tr>\n";
-       stock_bom_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
-       echo "</tr>\n";
+       while($unit = db_fetch($result))
+               $units[$unit['abbr']] = $unit['name'];
+
+       echo array_selector($name, $value, $units, array( 'disabled' => !$enabled) );
+
+       echo "</td></tr>\n";
 }
 
 //------------------------------------------------------------------------------------
 
-function base_stock_items_list($sql, $name, &$selected_id,
-       $all_option=false, $all_option_name="", $submit_on_change=false, $extra="")
+function stock_purchasable_fa_list_cells($label, $name, $selected_id=null, $all_option=false,
+       $submit_on_change=false, $all=false, $editkey = false, $exclude_items = array())
 {
-       global $all_items;
-
-       default_focus($name);
-       if ($submit_on_change==true)
-               echo "<select name='$name' onchange='this.form.submit();'>";
-       else if ($extra != "")
-               echo "<select name='$name' $extra>";
-       else
-               echo "<select name='$name'>";
-
-       $result = db_query($sql);
-
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       if ($all_option == true)
-       {
-       if ($selected_id == $all_items)
-       {
-            echo "<option selected value='$all_items'>$all_option_name</option>\n";
-       }
-       else
-       {
-            echo "<option value='$all_items'>$all_option_name</option>\n";
-       }
-               if ($selected_id == "")
-               {
-                       $selected_id = $all_items;
-               }
-       }
+       // Check if a fixed asset has been bought.
+       $where_opts[] = "stock_id NOT IN
+       ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE type=".ST_SUPPRECEIVE." AND qty!=0 )";
 
-       while ($row = db_fetch_row($result))
-       {
-               if ($selected_id == $row[0])
-               {
-                       echo "<option selected value='" . $row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $row[0] . "'>";
-               }
-               echo (user_show_codes()?$row[0] . "&nbsp;-&nbsp;":"") . $row[2] . "&nbsp;-&nbsp;" . $row[1] . "</option>\n";
-
-               if ($selected_id == "")
-               {
-                       $selected_id = $row[0];
-                       $_POST[$name] = $selected_id;
-               }
-       }
+       // exclude items currently on the order.
+       foreach($exclude_items as $item) {
+       $where_opts[] = "stock_id != ".db_escape($item->stock_id);
+       }
+       $where_opts[] = "mb_flag='F'";
 
-       echo "</select>";
-       db_free_result($result);
+       echo stock_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change, $all, $editkey, 
+    array('fixed_asset' => true, 'where' => $where_opts));
 }
 
-//------------------------------------------------------------------------------------
-
-function stock_manufactured_items_list($name, &$selected_id,
+function stock_disposable_fa_list($name, $selected_id=null,
        $all_option=false, $submit_on_change=false)
 {
-       $sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
-               FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
-               AND (".TB_PREF."stock_master.mb_flag='M')";
+       // Check if a fixed asset has been bought....
+       $where_opts[] = "stock_id IN
+       ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE type=".ST_SUPPRECEIVE." AND qty!=0 )";
+       // ...but has not been disposed or sold already.
+       $where_opts[] = "stock_id NOT IN
+               ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE (type=".ST_CUSTDELIVERY." OR type=".ST_INVADJUST.") AND qty!=0 )";
 
-       base_stock_items_list($sql, $name, $selected_id,        $all_option, _("All Items"),
-               $submit_on_change);
-}
+       $where_opts[] = "mb_flag='F'";
 
-function stock_manufactured_items_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
-{
-       if ($label != null)
-               echo "<td>$label</td>\n";
-       echo "<td>";
-       stock_manufactured_items_list($name, $selected_id, $all_option, $submit_on_change);
-       echo "</td>\n";
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+    array('fixed_asset' => true, 'where' => $where_opts));
 }
 
-function stock_manufactured_items_list_row($label, $name, $selected_id, $all_option=false, $submit_on_change=false)
+function stock_disposable_fa_list_cells($label, $name, $selected_id=null,
+       $all_option=false, $submit_on_change=false, $exclude_items = array())
 {
-       echo "<tr>\n";
-       stock_manufactured_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
-       echo "</tr>\n";
-}
+       // Check if a fixed asset has been bought....
+       $where_opts[] = "stock_id IN
+       ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE type=".ST_SUPPRECEIVE." AND qty!=0 )";
+       // ...but has not been disposed or sold already.
+       $where_opts[] = "stock_id NOT IN
+       ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE (type=".ST_CUSTDELIVERY." OR type=".ST_INVADJUST.") AND qty!=0 )";
 
-//------------------------------------------------------------------------------------
+       $where_opts[] = "mb_flag='F'";
 
-function stock_component_items_list($name, $parent_stock_id, &$selected_id,
-       $all_option=false, $submit_on_change=false)
-{
-       $sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
-               FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE
-               ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
-               AND stock_id != '$parent_stock_id'";
+       foreach($exclude_items as $item) {
+       $where_opts[] = "stock_id != ".db_escape($item->stock_id);
+       }
 
-       base_stock_items_list($sql, $name, $selected_id,
-               $all_option, _("All Items"), $submit_on_change);
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change, 
+    array('fixed_asset' => true, 'cells'=>true, 'where' => $where_opts));
 }
 
-//------------------------------------------------------------------------------------
-
-function stock_purchasable_items_list($name, &$selected_id,    $all_option=false, $submit_on_change=false, $extra="")
+function stock_depreciable_fa_list_cells($label, $name, $selected_id=null,
+       $all_option=false, $submit_on_change=false)
 {
-       global $all_items;
-
-       default_focus($name);
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-
-       $sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
-                               FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
-                               AND mb_flag !='M' ";
-       if (get_company_pref('no_item_list'))
-       {
-               global $search_button;
-               $edit_name = $name."_edit";
-               $edit_button = $name."_button";
-
-               $val = (isset($_POST[$edit_name]) && $_POST[$edit_name] != "" ? $_POST[$edit_name] : "");
-               if (isset($_POST[$edit_button]))
-               {
-                       $selected_id = $_POST[$name] = "";
-                       set_focus($name);
-               }
 
-               if ($selected_id != "")
-               {
-                       $val = DEFVAL;
-                       $sql .= "AND stock_id='$selected_id'";
-               }
-               elseif ($val != "" && $val != DEFVAL)
-               {
-                       $sql .= "AND
-                               (stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
-                               .TB_PREF."stock_master.description LIKE '%{$val}%')";
-               }
-               else
-                       $sql .= "LIMIT 1";
-               echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
+       // Check if a fixed asset has been bought....
+       $where_opts[] = "stock_id IN
+       ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE type=".ST_SUPPRECEIVE." AND qty!=0 )";
+       // ...but has not been disposed or sold already.
+       $where_opts[] = "stock_id NOT IN
+       ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE (type=".ST_CUSTDELIVERY." OR type=".ST_INVADJUST.") AND qty!=0 )";
 
-               echo sprintf($search_button, $edit_button);
-       }
+       $year = get_current_fiscalyear();
+       $begin = date2sql(add_months(sql2date($year['begin']), -1));
+       $end = date2sql(add_months(sql2date($year['end']), -1));
 
-       $result = db_query($sql);
+       // check if current fiscal year
+       $where_opts[] = "depreciation_date <= '".$end."'";
+       $where_opts[] = "depreciation_date >= '".$begin."'";
 
-       if ($submit_on_change==true)
-               echo "<select name='$name' onchange='this.form.submit();'>";
-       else if ($extra != "")
-               echo "<select name='$name' $extra>";
-       else
-               echo "<select name='$name'>";
+       $where_opts[] = "material_cost > 0";
+       $where_opts[] = "mb_flag='F'";
 
-       if ($all_option == true)
-       {
-       if ($selected_id == $all_items)
-       {
-            echo "<option selected value='$all_items'>"._("All Items")."</option>\n";
-       }
-       else
-       {
-            echo "<option value='$all_items'>"._("All Items")."</option>\n";
-       }
-               if ($selected_id == "")
-               {
-                       $selected_id = $all_items;
-                       $_POST[$name] = $selected_id;
-               }
-       }
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+                array('fixed_asset' => true, 'where' => $where_opts, 'cells'=>true));
+}
 
-       while ($row = db_fetch_row($result))
-       {
-               if ($selected_id == $row[0])
-               {
-                       echo "<option selected value='" . $row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $row[0] . "'>";
-               }
-               echo (user_show_codes()?$row[0] . "&nbsp;-&nbsp;":"") . $row[2] . "&nbsp;-&nbsp;" . $row[1] . "</option>\n";
+//------------------------------------------------------------------------------------
 
-               if ($selected_id == "")
-               {
-                       $selected_id = $row[0];
-                       $_POST[$name] = $selected_id;
-               }
-       }
+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";
 
-       echo "</select>";
-       db_free_result($result);
+       return combo_input($name, $selected_id, $sql, 'id', 'name',
+               array(
+                       'spec_option' => $none_option,
+                       'spec_id' => ALL_NUMERIC,
+                       'select_submit'=> $submit_on_change,
+                       'async' => false,
+               ) );
 }
 
-function stock_purchasable_items_list_cells($label, $name, &$selected_id, $all_option=false, $submit_on_change=false, $extra = "")
+function tax_types_list_cells($label, $name, $selected_id=null, $none_option=false,
+       $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       stock_purchasable_items_list($name, $selected_id, $all_option, $submit_on_change, $extra);
+       echo tax_types_list($name, $selected_id, $none_option, $submit_on_change);
        echo "</td>\n";
 }
 
-function stock_purchasable_items_list_row($label, $name, &$selected_id, $all_option=false, $submit_on_change=false)
+function tax_types_list_row($label, $name, $selected_id=null, $none_option=false,
+       $submit_on_change=false)
 {
-       echo "<tr>\n";
-       stock_purchasable_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
+       echo "<tr><td class='label'>$label</td>";
+       tax_types_list_cells(null, $name, $selected_id, $none_option, $submit_on_change);
        echo "</tr>\n";
 }
 
 //------------------------------------------------------------------------------------
 
-function stock_costable_items_list($name, &$selected_id,
-       $all_option=false, $submit_on_change=false)
+function tax_groups_list($name, $selected_id=null,
+       $none_option=false, $submit_on_change=false)
 {
-       $sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
-               FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
-               AND mb_flag !='D'";
+       $sql = "SELECT id, name, inactive FROM ".TB_PREF."tax_groups";
 
-       base_stock_items_list($sql, $name, $selected_id,
-               $all_option, _("All Items"), $submit_on_change);
+       return combo_input($name, $selected_id, $sql, 'id', 'name',
+               array(
+                       'order' => 'id',
+                       'spec_option' => $none_option,
+                       'spec_id' => ALL_NUMERIC,
+                       'select_submit'=> $submit_on_change,
+                       'async' => false,
+               ) );
 }
 
-//------------------------------------------------------------------------------------
-
-function stock_item_types_list_row($label, $name, $selected_id, $enabled=true)
+function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
 {
-       default_focus($name);
-       echo "<tr>";
-       if ($label != NULL)
+       if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       if ($enabled)
-               echo "<select name='$name' onchange='this.form.submit();'>\n";
-       else
-               echo "<select disabled name='$name'>\n";
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       if ($selected_id == "")
-               $_POST[$name] = $selected_id = "B";
-       echo "<option " . ($selected_id == 'M'?" selected ":"") . " value='M'>" . _("Manufactured"). "</option>\n";
-       echo "<option " . ($selected_id == 'B'?" selected ":"") . " value='B'>" . _("Purchased"). "</option>\n";
-       echo "<option " . ($selected_id == 'D'?" selected ":"") . " value='D'>" . _("Service"). "</option>\n";
-       echo "</select></td></tr>\n";
+       echo tax_groups_list($name, $selected_id, $none_option, $submit_on_change);
+       echo "</td>\n";
 }
 
-function stock_units_list_row($label, $name, $value, $enabled=true)
+function tax_groups_list_row($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
 {
-       global $stock_units;
-
-       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]);
-
-       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";
+       echo "<tr><td class='label'>$label</td>";
+       tax_groups_list_cells(null, $name, $selected_id, $none_option, $submit_on_change);
+       echo "</tr>\n";
 }
 
 //------------------------------------------------------------------------------------
 
-function tax_types_list($name, $selected_id,
-       $none_option=false, $none_option_name=null, $submit_on_change=false)
+function item_tax_types_list($name, $selected_id=null, $show_inactive = false)
 {
-       simple_codeandname_list("SELECT id, CONCAT(name, ' (',rate,'%)') as name FROM ".TB_PREF."tax_types",
-               $name, $selected_id, $none_option, $none_option_name, true, $submit_on_change);
+       $sql ="SELECT id, name FROM ".TB_PREF."item_tax_types";
+       if (!$show_inactive)
+               $sql .= " WHERE !inactive";
+
+       return combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') );
 }
 
-function tax_types_list_cells($label, $name, $selected_id, $none_option=false,
-       $none_option_name=null, $submit_on_change=false)
+function item_tax_types_list_cells($label, $name, $selected_id=null, $show_inactive = false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       tax_types_list($name, $selected_id, $none_option, $none_option_name, $submit_on_change);
+       echo item_tax_types_list($name, $selected_id, $show_inactive);
        echo "</td>\n";
 }
 
-function tax_types_list_row($label, $name, $selected_id, $none_option=false,
-       $none_option_name=null, $submit_on_change=false)
+function item_tax_types_list_row($label, $name, $selected_id=null, $show_inactive = false)
 {
-       echo "<tr>\n";
-       tax_types_list_cells($label, $name, $selected_id, $none_option, $none_option_name, $submit_on_change);
+       echo "<tr><td class='label'>$label</td>";
+       item_tax_types_list_cells(null, $name, $selected_id, $show_inactive);
        echo "</tr>\n";
 }
 
 //------------------------------------------------------------------------------------
 
-function tax_groups_list($name, $selected_id,
-       $none_option=false, $none_option_name=null, $submit_on_change=false)
+function shippers_list($name, $selected_id=null)
 {
-       simple_codeandname_list("SELECT id, name FROM ".TB_PREF."tax_groups ORDER BY id",
-               $name, $selected_id, $none_option, $none_option_name, true, $submit_on_change);
+       $sql = "SELECT shipper_id, shipper_name, inactive FROM ".TB_PREF."shippers";
+       return combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', 
+               array('order'=>array('shipper_name')));
 }
 
-function tax_groups_list_cells($label, $name, $selected_id, $submit_on_change=false)
+function shippers_list_cells($label, $name, $selected_id=null)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       tax_groups_list($name, $selected_id, false, null, $submit_on_change);
+       echo shippers_list($name, $selected_id);
        echo "</td>\n";
 }
 
-function tax_groups_list_row($label, $name, $selected_id, $submit_on_change=false)
+function shippers_list_row($label, $name, $selected_id=null)
 {
-       echo "<tr>\n";
-       tax_groups_list_cells($label, $name, $selected_id, false, null, $submit_on_change);
+       echo "<tr><td class='label'>$label</td>";
+       shippers_list_cells(null, $name, $selected_id);
        echo "</tr>\n";
 }
 
-//------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------
 
-function item_tax_types_list($name, $selected_id)
+function sales_persons_list($name, $selected_id=null, $spec_opt=false)
 {
-       simple_codeandname_list("SELECT id, name FROM ".TB_PREF."item_tax_types ORDER BY id",
-               $name, $selected_id);
+       $sql = "SELECT salesman_code, salesman_name, inactive FROM ".TB_PREF."salesman";
+       return combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', 
+               array('order'=>array('salesman_name'),
+                       'spec_option' => $spec_opt,
+                       'spec_id' => ALL_NUMERIC));
 }
 
-function item_tax_types_list_cells($label, $name, $selected_id)
+function sales_persons_list_cells($label, $name, $selected_id=null, $spec_opt=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
-       echo "<td>";
-       item_tax_types_list($name, $selected_id);
+       echo "<td>\n";
+       echo sales_persons_list($name, $selected_id, $spec_opt);
        echo "</td>\n";
 }
 
-function item_tax_types_list_row($label, $name, $selected_id)
+function sales_persons_list_row($label, $name, $selected_id=null, $spec_opt=false)
 {
-       echo "<tr>\n";
-       item_tax_types_list_cells($label, $name, $selected_id);
+       echo "<tr><td class='label'>$label</td>";
+       sales_persons_list_cells(null, $name, $selected_id, $spec_opt);
        echo "</tr>\n";
 }
 
 //------------------------------------------------------------------------------------
 
-function shippers_list($name, $selected_id)
+function sales_areas_list($name, $selected_id=null, $special_option=false)
 {
-       simple_codeandname_list("SELECT shipper_id, shipper_name FROM ".TB_PREF."shippers",
-               $name, $selected_id);
+       $sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas";
+       return combo_input($name, $selected_id, $sql, 'area_code', 'description', 
+               array('spec_option' => $special_option===true ? ' ' : $special_option,
+               'order' => 'description', 'spec_id' => 0));
 }
 
-function shippers_list_cells($label, $name, $selected_id)
+function sales_areas_list_cells($label, $name, $selected_id=null, $special_option=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       shippers_list($name, $selected_id);
+       echo sales_areas_list($name, $selected_id, $special_option);
        echo "</td>\n";
 }
 
-function shippers_list_row($label, $name, $selected_id)
+function sales_areas_list_row($label, $name, $selected_id=null, $special_option=false)
 {
-       echo "<tr>\n";
-       shippers_list_cells($label, $name, $selected_id);
+       echo "<tr><td class='label'>$label</td>";
+       sales_areas_list_cells(null, $name, $selected_id, $special_option);
        echo "</tr>\n";
 }
 
-//-------------------------------------------------------------------------------------
+//------------------------------------------------------------------------------------
 
-function sales_persons_list($name, $selected_id)
+function sales_groups_list($name, $selected_id=null, $special_option=false)
 {
-       simple_codeandname_list("SELECT salesman_code, salesman_name FROM ".TB_PREF."salesman",
-               $name, $selected_id);
+       $sql = "SELECT id, description, inactive FROM ".TB_PREF."groups";
+       return combo_input($name, $selected_id, $sql, 'id', 'description', array(
+               'spec_option' => $special_option===true ? ' ' : $special_option,
+               'order' => 'description', 'spec_id' => 0,
+       ));
 }
 
-function sales_persons_list_cells($label, $name, $selected_id)
+function sales_groups_list_cells($label, $name, $selected_id=null, $special_option=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
-       echo "<td>\n";
-       sales_persons_list($name, $selected_id);
+       echo "<td>";
+       echo sales_groups_list($name, $selected_id, $special_option);
        echo "</td>\n";
 }
 
-function sales_persons_list_row($label, $name, $selected_id, $submit_on_change=false)
+function sales_groups_list_row($label, $name, $selected_id=null, $special_option=false)
 {
-       echo "<tr>\n";
-       sales_persons_list_cells($label, $name, $selected_id, $submit_on_change=false);
+       echo "<tr><td class='label'>$label</td>";
+       sales_groups_list_cells(null, $name, $selected_id, $special_option);
        echo "</tr>\n";
 }
 
 //------------------------------------------------------------------------------------
 
-function sales_areas_list($name, $selected_id)
+function _format_template_items($row)
+{
+       return ($row[0] . "&nbsp;- &nbsp;" . _("Amount") . "&nbsp;".$row[1]);
+}
+
+function templates_list($name, $selected_id=null, $special_option=false)
 {
-       simple_codeandname_list("SELECT area_code, description FROM ".TB_PREF."areas",
-               $name, $selected_id);
+       $sql = "SELECT sorder.order_no, Sum(line.unit_price*line.quantity*(1-line.discount_percent)) AS OrderValue
+               FROM ".TB_PREF."sales_orders as sorder, ".TB_PREF."sales_order_details as line
+               WHERE sorder.order_no = line.order_no AND sorder.type = 1 GROUP BY line.order_no";
+       return combo_input($name, $selected_id, $sql, 'order_no', 'OrderValue', array(
+               'format' => '_format_template_items',
+               'spec_option' => $special_option===true ? ' ' : $special_option,
+               'order' => 'order_no', 'spec_id' => 0,
+       ));
 }
 
-function sales_areas_list_cells($label, $name, $selected_id)
+function templates_list_cells($label, $name, $selected_id=null, $special_option=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       sales_areas_list($name, $selected_id);
+       echo templates_list($name, $selected_id, $special_option);
        echo "</td>\n";
 }
 
-function sales_areas_list_row($label, $name, $selected_id)
+function templates_list_row($label, $name, $selected_id=null, $special_option=false)
 {
-       echo "<tr>\n";
-       sales_areas_list_cells($label, $name, $selected_id);
+       echo "<tr><td class='label'>$label</td>";
+       templates_list_cells(null, $name, $selected_id, $special_option);
        echo "</tr>\n";
 }
 
 //------------------------------------------------------------------------------------
 
-function workorders_list($name, $selected_id)
+function workorders_list($name, $selected_id=null)
 {
-       simple_codeandname_list("SELECT id, wo_ref FROM ".TB_PREF."workorders WHERE closed=0",
-               $name, $selected_id);
+       $sql = "SELECT id, wo_ref FROM ".TB_PREF."workorders WHERE closed=0";
+       return 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";
        echo "<td>";
-       workorders_list($name, $selected_id);
+       echo workorders_list($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);
+       echo "<tr><td class='label'>$label</td>";
+       workorders_list_cells(null, $name, $selected_id);
        echo "</tr>\n";
 }
 
 //------------------------------------------------------------------------------------
 
-function payment_terms_list($name, $selected_id)
+function payment_terms_list($name, $selected_id=null)
 {
-       simple_codeandname_list("SELECT terms_indicator, terms FROM ".TB_PREF."payment_terms",
-               $name, $selected_id);
+       $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
+       return 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";
        echo "<td>";
-       payment_terms_list($name, $selected_id);
+       echo payment_terms_list($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);
+       echo "<tr><td class='label'>$label</td>";
+       payment_terms_list_cells(null, $name, $selected_id);
        echo "</tr>\n";
 }
 
 //------------------------------------------------------------------------------------
 
-function credit_status_list($name, $selected_id)
+function credit_status_list($name, $selected_id=null)
 {
-       simple_codeandname_list("SELECT id, reason_description FROM ".TB_PREF."credit_status",
-               $name, $selected_id);
+       $sql ="SELECT id, reason_description, inactive FROM ".TB_PREF."credit_status";
+       return 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";
        echo "<td>";
-       credit_status_list($name, $selected_id);
+       echo credit_status_list($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);
+       echo "<tr><td class='label'>$label</td>";
+       credit_status_list_cells(null, $name, $selected_id);
        echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------------------
 
-function sales_types_list($name, $selected_id, $submit_on_change=false, $special_option=null)
+function sales_types_list($name, $selected_id=null, $submit_on_change=false, $special_option=false)
 {
-       simple_codeandname_list("SELECT id, sales_type FROM ".TB_PREF."sales_types",
-               $name, $selected_id,
-               isset($special_option), $special_option, true, $submit_on_change);
+       $sql = "SELECT id, sales_type, inactive FROM ".TB_PREF."sales_types";
+
+       return combo_input($name, $selected_id, $sql, 'id', 'sales_type',
+       array(
+               'spec_option' => $special_option===true ? _("All Sales Types") : $special_option,
+               'spec_id' => 0,
+               'select_submit'=> $submit_on_change,
+       ) );
 }
 
-function sales_types_list_cells($label, $name, $selected_id, $submit_on_change=false, $special_option=null)
+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";
        echo "<td>";
-       sales_types_list($name, $selected_id, $submit_on_change, $special_option);
+       echo sales_types_list($name, $selected_id, $submit_on_change, $special_option);
        echo "</td>\n";
 }
 
-function sales_types_list_row($label, $name, $selected_id, $submit_on_change=false, $special_option=null)
+function sales_types_list_row($label, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
 {
-       echo "<tr>\n";
-       sales_types_list_cells($label, $name, $selected_id, $submit_on_change, $special_option);
+       echo "<tr><td class='label'>$label</td>";
+       sales_types_list_cells(null, $name, $selected_id, $submit_on_change, $special_option);
        echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------------------
 
-function movement_types_list($name, $selected_id)
+function _format_date($row)
 {
-       simple_codeandname_list("SELECT id, name FROM ".TB_PREF."movement_types",
-               $name, $selected_id);
+       return sql2date($row['reconciled']);
 }
 
-function movement_types_list_cells($label, $name, $selected_id)
+function bank_reconciliation_list($account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
+{
+       $sql = "SELECT reconciled, reconciled FROM ".TB_PREF."bank_trans
+               WHERE bank_act=".db_escape($account)." AND reconciled IS NOT NULL
+               GROUP BY reconciled";
+       return combo_input($name, $selected_id, $sql, 'id', 'reconciled',
+               array(
+                       'spec_option' => $special_option,
+                       'format' => '_format_date',
+                       'spec_id' => '',
+                       'select_submit'=> $submit_on_change
+               ) );
+}
+
+function bank_reconciliation_list_cells($label,$account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       movement_types_list($name, $selected_id);
+       echo bank_reconciliation_list($account, $name, $selected_id, $submit_on_change, $special_option);
        echo "</td>\n";
 }
-
-function movement_types_list_row($label, $name, $selected_id)
+/*
+function bank_reconciliation_list_row($label, $account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
 {
        echo "<tr>\n";
-       movement_types_list_cells($label, $name, $selected_id);
+       bank_reconciliation_list_cells($label, $account, $name, $selected_id, $submit_on_change, $special_option);
        echo "</tr>\n";
 }
-
+*/
 //-----------------------------------------------------------------------------------------------
 
-function bank_trans_types_list($name, $selected_id)
+function workcenter_list($name, $selected_id=null, $all_option=false)
 {
-       simple_codeandname_list("SELECT id, name FROM ".TB_PREF."bank_trans_types",
-               $name, $selected_id);
+
+       $sql = "SELECT id, name, inactive FROM ".TB_PREF."workcentres";
+
+       return combo_input($name, $selected_id, $sql, 'id', 'name',
+               array(
+                       'spec_option' =>$all_option===true ? _("All Suppliers") : $all_option,
+                       'spec_id' => ALL_TEXT,
+               ) );
 }
 
-function bank_trans_types_list_cells($label, $name, $selected_id)
+function workcenter_list_cells($label, $name, $selected_id=null, $all_option=false)
 {
+       default_focus($name);
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       bank_trans_types_list($name, $selected_id);
+       echo workcenter_list($name, $selected_id, $all_option);
        echo "</td>\n";
 }
 
-function bank_trans_types_list_row($label, $name, $selected_id)
+function workcenter_list_row($label, $name, $selected_id=null, $all_option=false)
 {
-       echo "<tr>\n";
-       bank_trans_types_list_cells($label, $name, $selected_id);
+       echo "<tr><td class='label'>$label</td>";
+       workcenter_list_cells(null, $name, $selected_id, $all_option);
        echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------------------
 
-function workcenter_list($name, $selected_id, $all_option=false)
+function bank_accounts_list($name, $selected_id=null, $submit_on_change=false, $spec_option=false)
 {
-       global $all_items;
-
-       default_focus($name);
-       echo "<select name='$name'>";
-
-       $sql = "SELECT id, name FROM ".TB_PREF."workcentres";
-       $result = db_query($sql);
-
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       if ($all_option == true)
-       {
-       if ($selected_id == $all_items)
-       {
-            echo "<option selected value='$all_items'>" . _("All Work Centres") . "</option>\n";
-       }
-       else
-       {
-            echo "<option value='$all_items'>" . _("All Work Centres") . "</option>\n";
-       }
-       }
-
-       while ($row = db_fetch_row($result))
-       {
-               if ($selected_id == $row[0])
-               {
-                       echo "<option selected value='" . $row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $row[0] . "'>";
-               }
-               echo $row[1] . "</option>\n";
-       }
+       $sql = "SELECT id, bank_account_name, bank_curr_code, inactive
+               FROM ".TB_PREF."bank_accounts";
 
-       echo "</select>";
-       db_free_result($result);
+       return combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
+               array(
+                       'format' => '_format_add_curr',
+                       'select_submit'=> $submit_on_change,
+                       'spec_option' => $spec_option,
+                       'spec_id' => '',
+                       'async' => false
+               ) );
 }
 
-function workcenter_list_cells($label, $name, $selected_id, $all_option=false)
+function bank_accounts_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
 {
-       default_focus($name);
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       workcenter_list($name, $selected_id, $all_option);
+       echo bank_accounts_list($name, $selected_id, $submit_on_change);
        echo "</td>\n";
 }
 
-function workcenter_list_row($label, $name, $selected_id, $all_option=false)
+function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
-       echo "<tr>\n";
-       workcenter_list_cells($label, $name, $selected_id, $all_option);
+       echo "<tr><td class='label'>$label</td>";
+       bank_accounts_list_cells(null, $name, $selected_id, $submit_on_change);
        echo "</tr>\n";
 }
+//-----------------------------------------------------------------------------------------------
+
+function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false, $all_option=false)
+{
 
+       $sql = "SELECT id, bank_account_name, bank_curr_code, inactive
+               FROM ".TB_PREF."bank_accounts
+               WHERE account_type=".BT_CASH;
+
+       if ($label != null)
+               echo "<tr><td class='label'>$label</td>\n";
+       echo "<td>";
+       echo combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
+               array(
+                       'spec_option' => $all_option,
+                       'spec_id' => ALL_TEXT,
+                       'format' => '_format_add_curr',
+                       'select_submit'=> $submit_on_change,
+                       'async' => true
+               ) );
+       echo "</td></tr>\n";
+}
 //-----------------------------------------------------------------------------------------------
 
-function bank_accounts_list($name, $selected_id, $submit_on_change=false)
+function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $submit_on_change=false)
 {
+       $sql = "SELECT id, pos_name, inactive FROM ".TB_PREF."sales_pos";
+
        default_focus($name);
-       if ($submit_on_change==true)
-               echo "<select name='$name' onchange='this.form.submit();'>";
-       else
-               echo "<select name='$name'>";
+       echo '<tr>';
+       if ($label != null)
+               echo "<td class='label'>$label</td>\n";
+       echo "<td>";
+
+       echo combo_input($name, $selected_id, $sql, 'id', 'pos_name',
+               array(
+                       'select_submit'=> $submit_on_change,
+                       'async' => true,
+                       'spec_option' =>$spec_option,
+                       'spec_id' => -1,
+                       'order'=> array('pos_name')
+               ) );
+       echo "</td></tr>\n";
 
-       $company_currency = get_company_currency();
+}
+//-----------------------------------------------------------------------------------------------
+// Payment type selector for current user.
+//
+function sale_payment_list($name, $category, $selected_id=null, $submit_on_change=true, $prepayments=true)
+{
+       $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
 
-       $sql = "SELECT ".TB_PREF."bank_accounts.account_code, bank_account_name, bank_curr_code
-               FROM ".TB_PREF."bank_accounts, ".TB_PREF."chart_master
-               WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
-       $result = db_query($sql);
+       if ($category == PM_CASH) // only cash
+                       $sql .= " WHERE days_before_due=0 AND day_in_following_month=0";
+       elseif ($category == PM_CREDIT) // only delayed payments
+                       $sql .= " WHERE days_before_due".($prepayments ? '!=': '>')."0 OR day_in_following_month!=0";
+       elseif (!$prepayments)
+                       $sql .= " WHERE days_before_due>=0";
 
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       while ($row = db_fetch_row($result))
-       {
-               if ($selected_id == $row[0])
-               {
-                       echo "<option selected value='" . $row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $row[0] . "'>";
-               }
-               echo $row[1];
-               if ($company_currency != $row[2])
-                       echo "&nbsp;-&nbsp;" . $row[2];
-               echo  "</option>\n";
-               if ($selected_id == "")
-               {
-                       $selected_id = $row[0];
-                       $_POST[$name] = $selected_id;
-               }
-       }
+       return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms',
+               array(
+                       'select_submit'=> $submit_on_change,
+                       'async' => true
+               ) );
 
-       echo "</select>";
-       db_free_result($result);
 }
 
-function bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change=false)
+function sale_payment_list_cells($label, $name, $category, $selected_id=null, $submit_on_change=true, $prepayments=true)
 {
        if ($label != null)
-               echo "<td>$label</td>\n";
+               echo "<td class='label'>$label</td>\n";
        echo "<td>";
-       bank_accounts_list($name, $selected_id, $submit_on_change);
+
+       echo sale_payment_list($name, $category, $selected_id, $submit_on_change, $prepayments);
+
        echo "</td>\n";
 }
+//-----------------------------------------------------------------------------------------------
 
-function bank_accounts_list_row($label, $name, $selected_id, $submit_on_change=false)
+function class_list($name, $selected_id=null, $submit_on_change=false)
 {
-       echo "<tr>\n";
-       bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change);
-       echo "</tr>\n";
-}
-
-//-----------------------------------------------------------------------------------------------
-
-function class_list($name, $selected_id, $submit_on_change=false)
-{
-       default_focus($name);
-       if ($submit_on_change==true)
-               echo "<select name='$name' onchange='this.form.submit();'>";
-       else
-               echo "<select name='$name'>";
-
        $sql = "SELECT cid, class_name FROM ".TB_PREF."chart_class";
-       $result = db_query($sql);
 
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       while ($row = db_fetch_row($result))
-       {
-               if ($selected_id == $row[0])
-               {
-                       echo "<option selected value='" . $row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $row[0] . "'>";
-               }
-               echo $row[1] . "</option>\n";
-               if ($selected_id == "")
-               {
-                       $selected_id = $row[0];
-                       $_POST[$name] = $selected_id;
-               }
-       }
+       return combo_input($name, $selected_id, $sql, 'cid', 'class_name',
+               array(
+                       'select_submit'=> $submit_on_change,
+                       'async' => false
+               ) );
 
-       echo "</select>";
-       db_free_result($result);
 }
 
-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";
        echo "<td>";
-       class_list($name, $selected_id, $submit_on_change);
+       echo class_list($name, $selected_id, $submit_on_change);
        echo "</td>\n";
 }
 
-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";
-       class_list_cells($label, $name, $selected_id, $submit_on_change);
+       echo "<tr><td class='label'>$label</td>";
+       class_list_cells(null, $name, $selected_id, $submit_on_change);
        echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------------------
-
-function stock_categories_list($name, $selected_id)
+function stock_categories_list($name, $selected_id=null, $spec_opt=false, $submit_on_change=false, $fixed_asset=false)
 {
-       simple_codeandname_list("SELECT category_id, description FROM ".TB_PREF."stock_category
-               ORDER BY category_id", $name, $selected_id);
+       $where_opts = array();
+       if ($fixed_asset)
+               $where_opts[0] = "dflt_mb_flag='F'";
+       else
+               $where_opts[0] = "dflt_mb_flag!='F'";
+
+       $sql = "SELECT category_id, description, inactive FROM ".TB_PREF."stock_category";
+       return combo_input($name, $selected_id, $sql, 'category_id', 'description',
+               array('order'=>'category_id',
+                       'spec_option' => $spec_opt,
+                       'spec_id' => -1,
+                       'select_submit'=> $submit_on_change,
+                       'async' => true,
+                       'where' => $where_opts,
+               ));
 }
 
-function stock_categories_list_cells($label, $name, $selected_id)
+function stock_categories_list_cells($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false, $fixed_asset=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       stock_categories_list($name, $selected_id);
+       echo stock_categories_list($name, $selected_id, $spec_opt, $submit_on_change, $fixed_asset);
        echo "</td>\n";
 }
 
-function stock_categories_list_row($label, $name, $selected_id)
+function stock_categories_list_row($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false, $fixed_asset=false)
 {
-       echo "<tr>\n";
-       stock_categories_list_cells($label, $name, $selected_id);
+       echo "<tr><td class='label'>$label</td>";
+       stock_categories_list_cells(null, $name, $selected_id, $spec_opt, $submit_on_change, $fixed_asset);
        echo "</tr>\n";
 }
 
+//-----------------------------------------------------------------------------------------------
+function fixed_asset_classes_list($name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
+{
+       $sql = "SELECT c.fa_class_id, CONCAT(c.fa_class_id,' - ',c.description) `desc`, CONCAT(p.fa_class_id,' - ',p.description) `class`, c.inactive FROM "
+               .TB_PREF."stock_fa_class c LEFT JOIN ".TB_PREF."stock_fa_class p ON c.parent_id=p.fa_class_id";
+
+       return combo_input($name, $selected_id, $sql, 'c.fa_class_id', 'desc',
+               array('order'=>'c.fa_class_id',
+                       'spec_option' => $spec_opt,
+                       'spec_id' => '-1',
+                       'select_submit'=> $submit_on_change,
+                       'async' => true,
+                       'search_box' => true,
+                       'search' => array("c.fa_class_id"),
+                   'search_submit' => false,
+                   'spec_id' => '',
+                   'size' => 3,
+                   'max' => 3,
+                       'category' => 'class',
+               ));
+}
+
+function fixed_asset_classes_list_row($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
+{
+       echo "<tr><td class='label'>$label</td>";
+       echo "<td>";
+       echo fixed_asset_classes_list($name, $selected_id, $spec_opt, $submit_on_change);
+       echo "</td></tr>\n";
+}
+
 //-----------------------------------------------------------------------------------------------
 
-function gl_account_types_list($name, $selected_id, $all_option, $all_option_name,
-       $all_option_numeric)
+function gl_account_types_list($name, $selected_id=null, $all_option=false, $all=true)
 {
-       simple_codeandname_list("SELECT id, name FROM ".TB_PREF."chart_types ORDER BY id",
-               $name, $selected_id, $all_option, $all_option_name, $all_option_numeric);
+
+       $sql = "SELECT id, name FROM ".TB_PREF."chart_types";
+
+       return combo_input($name, $selected_id, $sql, 'id', 'name',
+               array(
+                       'format' => '_format_account',
+                       'order' => array('class_id', 'id', 'parent'),
+                       'spec_option' =>$all_option,
+                       'spec_id' => ALL_TEXT
+               ) );
 }
 
-function gl_account_types_list_cells($label, $name, $selected_id, $all_option=false, $all_option_name=null,
-       $all_option_numeric=false)
+function gl_account_types_list_cells($label, $name, $selected_id=null, $all_option=false, $all=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       gl_account_types_list($name, $selected_id, $all_option, $all_option_name, $all_option_numeric);
+       echo gl_account_types_list($name, $selected_id, $all_option, $all);
        echo "</td>\n";
 }
 
-function gl_account_types_list_row($label, $name, $selected_id, $all_option=false, $all_option_name=null,
-       $all_option_numeric=false)
+function gl_account_types_list_row($label, $name, $selected_id=null, $all_option=false,        $all=false)
 {
-       echo "<tr>\n";
-       gl_account_types_list_cells($label, $name, $selected_id, $all_option,
-               $all_option_name, $all_option_numeric);
+       echo "<tr><td class='label'>$label</td>";
+       gl_account_types_list_cells(null, $name, $selected_id, $all_option,
+               $all);
        echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------------------
-
-function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false,
-       $show_group=false, $params="")
+function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=false,
+       $cells=false, $all_option=false, $submit_on_change=false, $all=false, $type_id=false)
 {
-       default_focus($name);
-       echo "<select name='$name'";
-       if ($params != "")
-               echo " $params";
-       echo ">";
-
        if ($skip_bank_accounts)
-               $sql = "SELECT ".TB_PREF."chart_master.account_code, ".TB_PREF."chart_master.account_name, ".TB_PREF."chart_types.name
-                       FROM (".TB_PREF."chart_master,".TB_PREF."chart_types) LEFT JOIN ".TB_PREF."bank_accounts ON ".TB_PREF."chart_master.account_code=".TB_PREF."bank_accounts.account_code
-            WHERE ".TB_PREF."bank_accounts.account_code IS NULL
-                       AND ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id
-                       ORDER BY account_code;";
+               $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 account_code, account_name,".TB_PREF."chart_types.name
-                       FROM ".TB_PREF."chart_master, ".TB_PREF."chart_types
-                       WHERE ".TB_PREF."chart_master.account_type=".TB_PREF."chart_types.id
-                       ORDER BY account_code";
-
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       $result = db_query($sql, "query chart master");
-
-       while ($row = db_fetch_row($result))
-       {
-               if ($selected_id == $row[0])
-               {
-                       echo "<option selected value='" . $row[0] . "'>";
-               }
-               else
-               {
-                       echo "<option value='" . $row[0] . "'>";
-               }
-               //echo str_pad($row[0],6,'0', STR_PAD_LEFT) .  "&nbsp;&nbsp;&nbsp;&nbsp;" . $row[2] . "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $row[1];
-               if ($show_group)
-                       echo $row[0] .  "&nbsp;&nbsp;&nbsp;&nbsp;" . $row[2] . "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $row[1] . "</option>\n";
-               else
-                       echo $row[0] .  "&nbsp;&nbsp;&nbsp;&nbsp;" . $row[1] . "</option>\n";
-
-               if ($selected_id == "")
-               {
-                       $selected_id = $row[0];
-                       $_POST[$name] = $selected_id;
-               }
-       }
-
-       echo "</select>";
-       db_free_result($result);
-}
-
-function gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts=false,
-       $show_group=false, $params="")
+               $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";
+       if ($type_id ) $sql .= " AND chart.account_type=".db_escape($type_id);
+       $account = ($skip_bank_accounts ? "account2" : "account");
+       return combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name',
+               array(
+                       'format' => '_format_account',
+                       'spec_option' => $all_option===true ?  _("Use Item Sales Accounts") : $all_option,
+                       'spec_id' => '',
+                       'type' => 2,
+                       'order' => array('type.class_id','type.id','account_code'),
+                       'search_box' => $cells,
+                       'search_submit' => false,
+                       'size' => 12,
+                       'max' => 10,
+                       'cells' => true,
+                       'select_submit'=> $submit_on_change,
+                       'async' => false,
+                       'category' => 2,
+                       'show_inactive' => $all
+               ), $account );
+}
+
+function _format_account($row)
+{
+       return $row[0] .  "&nbsp;&nbsp;&nbsp;&nbsp;" . $row[1];
+}
+
+function gl_all_accounts_list_cells($label, $name, $selected_id=null, 
+       $skip_bank_accounts=false, $cells=false, $all_option=false, 
+       $submit_on_change=false, $all=false, $type_id=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       gl_all_accounts_list($name, $selected_id, $skip_bank_accounts, $show_group, $params);
+       echo gl_all_accounts_list($name, $selected_id, 
+               $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all, $type_id);
        echo "</td>\n";
 }
 
-function gl_all_accounts_list_row($label, $name, $selected_id, $skip_bank_accounts=false,
-       $show_group=false, $params="")
+function gl_all_accounts_list_row($label, $name, $selected_id=null, 
+       $skip_bank_accounts=false, $cells=false, $all_option=false, $type_id=false)
 {
-       echo "<tr>\n";
-       gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts,
-               $show_group, $params);
+       echo "<tr><td class='label'>$label</td>";
+       gl_all_accounts_list_cells(null, $name, $selected_id, 
+               $skip_bank_accounts, $cells, $all_option, $type_id);
        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();'>";
-       else
-               echo "<select name='$name'>";
+       $items = array();
+       $items['0'] = strlen($name_no) ? $name_no : _("No");
+       $items['1'] = strlen($name_yes) ? $name_yes : _("Yes");
 
-       if (strlen($name_yes) == 0)
-       {
-               unset($name_yes);
-       }
-       if (strlen($name_no) == 0)
-       {
-               unset($name_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";
        echo "<td>";
-       yesno_list($name, $selected_id, $name_yes, $name_no, $submit_on_change);
+       echo yesno_list($name, $selected_id, $name_yes, $name_no, $submit_on_change);
        echo "</td>\n";
 }
 
-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";
-       yesno_list_cells($label, $name, $selected_id, $name_yes, $name_no, $submit_on_change);
+       echo "<tr><td class='label'>$label</td>";
+       yesno_list_cells(null, $name, $selected_id, $name_yes, $name_no, $submit_on_change);
        echo "</tr>\n";
 }
 
 //------------------------------------------------------------------------------------------------
 
-function languages_list($name, &$selected_id)
+function languages_list($name, $selected_id=null, $all_option=false)
 {
-       global $installed_languages;
+       global $installed_languages;
 
-       default_focus($name);
-       echo "<select name='$name'>";
-
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
+       $items = array();
+       if ($all_option)
+               $items[''] = $all_option;
        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, $all_option=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       languages_list($name, $selected_id);
+       echo languages_list($name, $selected_id, $all_option);
        echo "</td>\n";
 }
 
-function languages_list_row($label, $name, $selected_id)
+function languages_list_row($label, $name, $selected_id=null, $all_option=false)
 {
-       echo "<tr>\n";
-       languages_list_cells($label, $name, $selected_id);
+       echo "<tr><td class='label'>$label</td>";
+       languages_list_cells(null, $name, $selected_id, $all_option);
        echo "</tr>\n";
 }
 
 //------------------------------------------------------------------------------------------------
 
-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();
+       global $bank_account_types;
 
-       default_focus($name);
-       echo "<select name='$name'>";
-
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       foreach ($bank_account_types as $type)
-       {
-       echo "<option ";
-       if ($selected_id == "" || $selected_id == $type['id'])
-               echo "selected ";
-       echo "value='" . $type['id'] . "'>" . $type['name'] . "</option>\n";
-       }
+       return array_selector($name, $selected_id, $bank_account_types);
 }
 
-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";
        echo "<td>";
-       bank_account_types_list($name, $selected_id);
+       echo bank_account_types_list($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);
+       echo "<tr><td class='label'>$label</td>";
+       bank_account_types_list_cells(null, $name, $selected_id);
        echo "</tr>\n";
 }
 
 //------------------------------------------------------------------------------------------------
-
-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();
+       global $payment_person_types;
 
-       default_focus($name);
-       echo "<select name='$name'";
-       if ($related)
-               echo " onchange='this.form.$related.value=\"\"; this.form.submit();' ";
-       echo ">";
-
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       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 = array();
+       foreach ($payment_person_types as $key=>$type)
+       {
+               if ($key != PT_WORKORDER)
+                       $items[$key] = $type;
+       }               
+       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";
        echo "<td>";
-       payment_person_types_list($name, $selected_id, $related);
+       echo payment_person_types_list($name, $selected_id, $related);
        echo "</td>\n";
 }
 
-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";
-       payment_person_types_list_cells($label, $name, $selected_id, $related);
+       echo "<tr><td class='label'>$label</td>";
+       payment_person_types_list_cells(null, $name, $selected_id, $related);
        echo "</tr>\n";
 }
 
 //------------------------------------------------------------------------------------------------
 
-function wo_types_list($name, &$selected_id)
+function wo_types_list($name, $selected_id=null)
 {
-       $types = wo_types::get_all();
-
-       default_focus($name);
-       echo "<select name='$name' onchange='this.form.submit();'>";
-
-       if ($selected_id == null)
-               $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       foreach ($types as $type)
-       {
-           echo "<option ";
-           if ($selected_id == $type['id'])
-               echo "selected ";
-           echo "value='" . $type['id'] . "'>" . $type['name'] . "</option>\n";
-       }
-       echo "</select>";
+       global $wo_types_array;
+       
+       return array_selector($name, $selected_id, $wo_types_array, 
+               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";
-       wo_types_list($name, $selected_id);
+       echo "<tr><td class='label'>$label</td><td>\n";
+       echo wo_types_list($name, $selected_id);
        echo "</td></tr>\n";
 }
 
 //------------------------------------------------------------------------------------------------
 
-function dateformats_list_row($label, $name, $value)
+function dateformats_list_row($label, $name, $value=null)
 {
-       global $dateformats;
+       global $SysPrefs;
 
-       default_focus($name);
-       echo "<tr><td>$label</td>\n";
-       echo "<td><select name='$name'>";
+       echo "<tr><td class='label'>$label</td>\n<td>";
+       echo array_selector( $name, $value, $SysPrefs->dateformats );
+       echo "</td></tr>\n";
+}
 
-       if ($value == null)
-               $value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
-       $counter = 0;
-       foreach ($dateformats as $df)
-       {
+function dateseps_list_row($label, $name, $value=null)
+{
+       global $SysPrefs;
 
-               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 class='label'>$label</td>\n<td>";
+       echo array_selector( $name, $value, $SysPrefs->dateseps );
+       echo "</td></tr>\n";
 }
 
-function dateseps_list_row($label, $name, $value)
+function thoseps_list_row($label, $name, $value=null)
 {
-       global $dateseps;
+       global $SysPrefs;
 
-       default_focus($name);
-       echo "<tr><td>$label</td>\n";
-       echo "<td><select name='$name'>";
+       echo "<tr><td class='label'>$label</td>\n<td>";
+       echo array_selector( $name, $value, $SysPrefs->thoseps );
+       echo "</td></tr>\n";
+}
 
-       if ($value == null)
-               $value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
-       $counter = 0;
-       foreach ($dateseps as $ds)
-       {
+function decseps_list_row($label, $name, $value=null)
+{
+       global $SysPrefs;
 
-               if ($value==$counter)
-               {
-                       echo "<option selected value='$counter'>$ds</option>\n";
-               }
-               else
+       echo "<tr><td class='label'>$label</td>\n<td>";
+       echo array_selector( $name, $value, $SysPrefs->decseps );
+       echo "</td></tr>\n";
+}
+
+function themes_list_row($label, $name, $value=null)
+{
+       global $path_to_root;
+
+       $path = $path_to_root.'/themes/';
+       $themes = array();
+       $themedir = opendir($path);
+       while(false !== ($fname = readdir($themedir)))
+       {
+               if($fname!='.' && $fname!='..' && $fname!='CVS' && is_dir($path.$fname))
                {
-                       echo "<option value='$counter'>$ds</option>\n";
+                       $themes[$fname] =  $fname;
                }
-               $counter++;
        }
-       echo "</select></td></tr>\n";
+       ksort($themes);
+
+       echo "<tr><td class='label'>$label</td>\n<td>";
+       echo array_selector( $name, $value, $themes );
+       echo "</td></tr>\n";
 }
 
-function thoseps_list_row($label, $name, $value)
+function pagesizes_list_row($label, $name, $value=null)
 {
-       global $thoseps;
+       global $SysPrefs;
 
-       default_focus($name);
-       echo "<tr><td>$label</td>\n";
-       echo "<td><select name='$name'>";
+       $items = array();
+       foreach ($SysPrefs->pagesizes as $pz)
+               $items[$pz] = $pz;
 
-       if ($value == null)
-               $value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
-       $counter = 0;
-       foreach ($thoseps as $ts)
-       {
+       echo "<tr><td class='label'>$label</td>\n<td>";
+       echo array_selector( $name, $value, $items );
+       echo "</td></tr>\n";
+}
 
-               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";
+function systypes_list($name, $value=null, $spec_opt=false, $submit_on_change=false, $exclude=array())
+{
+       global $systypes_array;
+
+       // emove non-voidable transactions if needed
+       $systypes = array_diff_key($systypes_array, array_flip($exclude));
+       return array_selector($name, $value, $systypes, 
+               array( 
+                       'spec_option'=> $spec_opt,
+                       'spec_id' => ALL_NUMERIC,
+                       'select_submit'=> $submit_on_change,
+                       'async' => false,
+                       )
+       );
 }
 
-function decseps_list_row($label, $name, $value)
+function systypes_list_cells($label, $name, $value=null, $submit_on_change=false, $exclude=array())
 {
-       global $decseps;
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+       echo systypes_list($name, $value, false, $submit_on_change, $exclude);
+       echo "</td>\n";
+}
 
-       default_focus($name);
-       echo "<tr><td>$label</td>\n";
-       echo "<td><select name='$name'>";
+function systypes_list_row($label, $name, $value=null, $submit_on_change=false, $exclude=array())
+{
+       echo "<tr><td class='label'>$label</td>";
+       systypes_list_cells(null, $name, $value, $submit_on_change, $exclude);
+       echo "</tr>\n";
+}
 
-       if ($value == null)
-               $value = (!isset($_POST[$name]) ? 0 : $_POST[$name]);
-       $counter = 0;
-       foreach ($decseps as $ds)
-       {
+function journal_types_list_cells($label, $name, $value=null, $submit_on_change=false)
+{
+       global $systypes_array;
 
-               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";
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+
+       $items = $systypes_array;
+
+       // exclude quotes, orders and dimensions
+       foreach (array(ST_PURCHORDER, ST_SALESORDER, ST_DIMENSION, ST_SALESQUOTE, ST_LOCTRANSFER) as $excl)
+                       unset($items[$excl]);
+       
+       echo array_selector($name, $value, $items, 
+               array( 
+                       'spec_option'=> _("All"),
+                       'spec_id' => -1,
+                       'select_submit'=> $submit_on_change,
+                       'async' => false
+                       )
+       );
+       echo "</td>\n";
 }
 
-function themes_list_row($label, $name, $value)
+function cust_allocations_list_cells($label, $name, $selected=null, $submit_on_change=false)
 {
-       global $path_to_root;
 
-       default_focus($name);
-       $path = $path_to_root.'/themes/';
-       $themes = array();
-       $themedir = opendir($path);
-       while(false !== ($fname = readdir($themedir)))
-       {
-           if($fname!='.' && $fname!='..' && $fname!='CVS' && is_dir($path.$fname))
-           {
-                       $themes[] =  $fname;
-           }
-       }
-       sort($themes);
-       echo "<tr><td>$label</td>\n";
-       echo "<td><select name='$name'>";
+       if ($label != null)
+               label_cell($label);
+       echo "<td>\n";
+       $allocs = array( 
+               ALL_TEXT=>_("All Types"),
+               '1'=> _("Sales Invoices"),
+               '2'=> _("Unsettled transactions"),
+               '3' => _("Payments"),
+               '4' => _("Credit Notes"),
+               '5' => _("Delivery Notes")
+       );
+       echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
+       echo "</td>\n";
+}
 
-       if ($value == null)
-               $value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       foreach ($themes as $th)
-       {
+function supp_allocations_list_cell($name, $selected=null)
+{
 
-               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 "<td>\n";
+       $allocs = array( 
+               ALL_TEXT=>_("All Types"),
+               '1'=> _("Invoices"),
+               '2'=> _("Overdue Invoices"),
+               '3' => _("Payments"),
+               '4' => _("Credit Notes"),
+               '5' => _("Overdue Credit Notes")
+       );
+       echo array_selector($name, $selected, $allocs);
+       echo "</td>\n";
 }
 
-function pagesizes_list_row($label, $name, $value)
+function supp_transactions_list_cell($name, $selected=null, $submit_on_change=false)
 {
-       global $pagesizes;
 
-       default_focus($name);
-       echo "<tr><td>$label</td>\n";
-       echo "<td><select name='$name'>";
+       echo "<td>\n";
+       $allocs = array( 
+               ALL_TEXT=>_("All Types"),
+               '6'=>_("GRNs"),
+               '1'=> _("Invoices"),
+               '2'=> _("Unsettled transactions"),
+               '3' => _("Payments"),
+               '4' => _("Credit Notes"),
+               '5' => _("Overdue Credit Notes")
+       );
+
+       echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
+       echo "</td>\n";
+}
 
-       if ($value == null)
-               $value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       foreach ($pagesizes as $pz)
-       {
+function policy_list_cells($label, $name, $selected=null)
+{
+       if ($label != null)
+               label_cell($label);
+       echo "<td>\n";
+       echo array_selector($name, $selected, 
+                               array( '' => _("Automatically put balance on back order"),
+                                       'CAN' => _("Cancel any quantites not delivered")) );
+       echo "</td>\n";
+}
 
-               if ($value==$pz)
-               {
-                       echo "<option selected value='$pz'>$pz</option>\n";
-               }
-               else
-               {
-                       echo "<option value='$pz'>$pz</option>\n";
-               }
-       }
-       echo "</select></td></tr>\n";
+function policy_list_row($label, $name, $selected=null)
+{
+       echo "<tr><td class='label'>$label</td>";
+       policy_list_cells(null, $name, $selected);
+       echo "</tr>\n";
 }
 
-function security_headings_list_row($label, $name, $value)
+function credit_type_list_cells($label, $name, $selected=null, $submit_on_change=false)
 {
-       global $security_headings;
+       if ($label != null)
+               label_cell($label);
+       echo "<td>\n";
+       echo array_selector($name, $selected, 
+                       array( 'Return' => _("Items Returned to Inventory Location"),
+                               'WriteOff' => _("Items Written Off")),
+                       array( 'select_submit'=> $submit_on_change ) );
+       echo "</td>\n";
+}
 
-       default_focus($name);
-       echo "<tr><td>$label</td>\n";
-       echo "<td><select name='$name'>";
+function credit_type_list_row($label, $name, $selected=null, $submit_on_change=false)
+{
+       echo "<tr><td class='label'>$label</td>";
+       credit_type_list_cells(null, $name, $selected, $submit_on_change);
+       echo "</tr>\n";
+}
 
-       if ($value == null)
-               $value = (!isset($_POST[$name]) ? 0 : (int)$_POST[$name]);
-       $counter=0;
-       foreach ($security_headings as $sh)
-       {
+function number_list($name, $selected, $from, $to, $no_option=false)
+{
+       $items = array();
+       for ($i = $from; $i <= $to; $i++)
+               $items[$i] = "$i";
 
-               if ($value==$counter)
-               {
-                       echo "<option selected value='$counter'>$sh</option>\n";
-               }
-               else
-               {
-                       echo "<option value='$counter'>$sh</option>\n";
+       return array_selector($name, $selected, $items,
+                       array(  'spec_option' => $no_option,
+                                       'spec_id' => ALL_NUMERIC) );
+}
+
+function number_list_cells($label, $name, $selected, $from, $to, $no_option=false)
+{
+       if ($label != null)
+               label_cell($label);
+       echo "<td>\n";
+       echo number_list($name, $selected, $from, $to, $no_option);
+       echo "</td>\n";
+}
+
+function number_list_row($label, $name, $selected, $from, $to, $no_option=false)
+{
+       echo "<tr><td class='label'>$label</td>";
+       echo number_list_cells(null, $name, $selected, $from, $to, $no_option);
+       echo "</tr>\n";
+}
+
+function print_profiles_list_row($label, $name, $selected_id=null, $spec_opt=false,
+       $submit_on_change=true)
+{
+       $sql = "SELECT profile FROM ".TB_PREF."print_profiles"
+               ." GROUP BY profile";
+       $result = db_query($sql, 'cannot get all profile names');
+       $profiles = array();
+       while($myrow=db_fetch($result)) {
+               $profiles[$myrow['profile']] = $myrow['profile'];
+       }
+
+       echo "<tr>";
+       if ($label != null)
+               echo "<td class='label'>$label</td>\n";
+       echo "<td>";
+
+       echo array_selector($name, $selected_id, $profiles, 
+               array( 'select_submit'=> $submit_on_change,
+                       'spec_option'=>$spec_opt,
+                       'spec_id' => ''
+                ));
+
+       echo "</td></tr>\n";
+}
+
+function printers_list($name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
+{
+       static $printers; // query only once for page display
+
+       if (!$printers) {
+               $sql = "SELECT id, name, description FROM ".TB_PREF."printers"; 
+               $result = db_query($sql, 'cannot get all printers');
+               $printers = array();
+               while($myrow=db_fetch($result)) {
+                       $printers[$myrow['id']] = $myrow['name'].'&nbsp;-&nbsp;'.$myrow['description'];
                }
-               $counter++;
        }
-       echo "</select></td></tr>\n";
+       return array_selector($name, $selected_id, $printers, 
+               array( 'select_submit'=> $submit_on_change,
+                       'spec_option'=>$spec_opt,
+                       'spec_id' => ''
+                ));
 }
 
-function systypes_list_cells($label, $name, $value, $submit_on_change=false)
+//------------------------------------------------------------------------------------------------
+
+function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_change=false)
 {
-       global $systypes_array;
+       $where = false;
+       $sql = "SELECT id, description FROM ".TB_PREF."quick_entries";
+       if ($type != null)
+               $sql .= " WHERE type=$type";
 
-       default_focus($name);
+       return combo_input($name, $selected_id, $sql, 'id', 'description',
+               array(
+                       'spec_id' => '',
+                       'order' => 'description',
+                       'select_submit'=> $submit_on_change,
+                       'async' => false
+               ) );
+
+}
+
+function quick_entries_list_cells($label, $name, $selected_id=null, $type, $submit_on_change=false)
+{
        if ($label != null)
                echo "<td>$label</td>\n";
-    echo "<td><select name='$name'";
-    if ($submit_on_change)
-       echo " onchange='this.form.submit();'>";
-    else
-       echo ">";
-       if ($value == null)
-               $value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-    foreach ($systypes_array as $key=>$type)
-    {
-
-               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";
+       echo "<td>";    
+       echo quick_entries_list($name, $selected_id, $type, $submit_on_change);
+       echo "</td>";
 }
 
-function systypes_list_row($label, $name, $value, $submit_on_change=false)
+function quick_entries_list_row($label, $name, $selected_id=null, $type, $submit_on_change=false)
 {
-       echo "<tr>\n";
-       systypes_list_cells($label, $name, $value, $submit_on_change);
+       echo "<tr><td class='label'>$label</td>";
+       quick_entries_list_cells(null, $name, $selected_id, $type, $submit_on_change);
        echo "</tr>\n";
 }
 
-function cust_allocations_list_cells($label, $name, $selected)
+
+function quick_actions_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+       global $quick_actions;
+       
+       echo "<tr><td class='label'>$label</td><td>";
+       echo array_selector($name, $selected_id, $quick_actions, 
+               array( 
+                       'select_submit'=> $submit_on_change
+               ) );
+       echo "</td></tr>\n";
+}
+
+function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
-       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";
+       global $quick_entry_types;
+               
+       echo "<tr><td class='label'>$label</td><td>";
+       echo array_selector($name, $selected_id, $quick_entry_types, 
+               array( 
+                       'select_submit'=> $submit_on_change
+                       ) );
+       echo "</td></tr>\n";
+}
+
+function record_status_list_row($label, $name) {
+       return yesno_list_row($label, $name, null,      _('Inactive'), _('Active'));
 }
 
-function supp_allocations_list_cells($name, $selected)
+function class_types_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
-       global $all_items;
+       global $class_types;
+       
+       echo "<tr><td class='label'>$label</td><td>";
+       echo array_selector($name, $selected_id, $class_types, 
+               array( 
+                       'select_submit'=> $submit_on_change
+               ) );
+       echo "</td></tr>\n";
+}
 
-       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";
+//------------------------------------------------------------------------------------------------
+
+function security_roles_list($name, $selected_id=null, $new_item=false, $submit_on_change=false,
+       $show_inactive = false)
+{
+
+       $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 policy_list_cells($label, $name, $selected)
+function security_roles_list_cells($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false,
+       $show_inactive = false)
 {
-       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>$label</td>\n";
+       echo "<td>";
+       echo security_roles_list($name, $selected_id, $new_item, $submit_on_change, $show_inactive);
+       echo "</td>\n";
 }
 
-function policy_list_row($label, $name, $selected)
+function security_roles_list_row($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false,
+       $show_inactive = false)
 {
-       echo "<tr>\n";
-       policy_list_cells($label, $name, $selected);
+       echo "<tr><td class='label'>$label</td>";
+       security_roles_list_cells(null, $name, $selected_id, $new_item, $submit_on_change, $show_inactive);
        echo "</tr>\n";
 }
 
-function credit_type_list_cells($label, $name, $selected, $submit_on_change=false)
+function tab_list_row($label, $name, $selected_id=null)
 {
-       default_focus($name);
-       if ($selected == null)
-       {
-               $selected = (!isset($_POST[$name]) ? "Return" : $_POST[$name]);
-               if ($selected == "Return")
-                       $_POST[$name] = $selected;
+       global $installed_extensions;
+       
+       $tabs = array();
+       foreach ($_SESSION['App']->applications as $app) {
+               $tabs[$app->id] = access_string($app->name, true);
+       }
+       echo "<tr>\n";
+       echo "<td class='label'>$label</td><td>\n";
+       echo array_selector($name, $selected_id, $tabs);
+       echo "</td></tr>\n";
+}
+
+//-----------------------------------------------------------------------------------------------
+
+function tag_list($name, $height, $type, $multi=false, $all=false, $spec_opt = 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[''] = $all ? _("No tags defined.") : _("No active tags defined.");
+               $spec_opt = false;
        }
+       return array_selector($name, null, $tags,
+               array(
+                       'multi' => $multi,
+                       'height' => $height,
+                       'spec_option'=> $spec_opt,
+                       'spec_id' => -1,
+               ) );
+}
+
+function tag_list_cells($label, $name, $height, $type, $mult=false, $all=false, $spec_opt = false)
+{
        if ($label != null)
-               label_cell($label);
-    echo "<td><select name='$name'";
-    if ($submit_on_change)
-       echo " onchange='this.form.submit();'>";
-    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>$label</td>\n";
+       echo "<td>\n";
+       echo tag_list($name, $height, $type, $mult, $all, $spec_opt);
+       echo "</td>\n";
+       
 }
 
-function credit_type_list_row($label, $name, $selected, $submit_on_change=false)
+function tag_list_row($label, $name, $height, $type, $mult=false, $all=false, $spec_opt = false)
 {
-       echo "<tr>\n";
-       credit_type_list_cells($label, $name, $selected, $submit_on_change);
-       echo "</tr>\n";
+       echo "<tr><td class='label'>$label</td>";
+       tag_list_cells(null, $name, $height, $type, $mult, $all, $spec_opt);
+       echo "</tr>\n"; 
 }
 
-function number_list($name, $selected, $from, $to, $firstlabel="")
+//---------------------------------------------------------------------------------------------
+//     List of sets of active extensions 
+//
+function extset_list($name, $value=null, $submit_on_change=false)
 {
-       default_focus($name);
-       if ($selected == null)
-       {
-               $selected = (!isset($_POST[$name]) ? $from : $_POST[$name]);
-               if ($selected == $from)
-                       $_POST[$name] = $selected;
+       global $db_connections;
+
+       $items = array();
+       foreach ($db_connections as $comp)
+               $items[] = sprintf(_("Activated for '%s'"), $comp['name']);
+       return array_selector( $name, $value, $items,
+               array(
+                       'spec_option'=> _("Available and/or installed"),
+                       'spec_id' => -1,
+                       'select_submit'=> $submit_on_change,
+                       'async' => true
+               ));
+}
+
+function crm_category_types_list($name, $selected_id=null, $filter=array(), $submit_on_change=true)
+{
+
+       $sql = "SELECT id, name, type, inactive FROM ".TB_PREF."crm_categories";
+
+       $multi = false;
+       $groups = false;
+       $where = array();
+       if (@$filter['class']) {
+               $where[] = 'type='.db_escape($filter['class']);
+       } else
+               $groups = 'type';
+       if (@$filter['subclass']) $where[] = 'action='.db_escape($filter['subclass']);
+       if (@$filter['entity']) $where[] = 'entity_id='.db_escape($filter['entity']);
+       if (@$filter['multi']) { // contact category selector for person
+               $multi = true;
        }
-       echo "<select name='$name'>";
-       for ($i = $from; $i <= $to; $i++)
-    {
-               if ($i == 0 && $firstlabel != "")
-                       $label = $firstlabel;
-               else
-                       $label = $i;
-               if ($selected == $i)
-               {
-                       echo "<option selected value='$i'>$label</option>\n";
-               }
-               else
+
+       return combo_input($name, $selected_id, $sql, 'id', 'name',
+               array(
+                       'multi' => $multi,
+                       'height' => $multi ? 5:1,
+                       'category' => $groups,
+                       'select_submit'=> $submit_on_change,
+                       'async' => true,
+                       'where' => $where
+               ));
+}
+
+function crm_category_types_list_row($label, $name, $selected_id=null, $filter=array(), $submit_on_change=true)
+{
+       echo "<tr><td class='label'>$label</td><td>";
+       echo crm_category_types_list($name, $selected_id, $filter, $submit_on_change);
+       echo "</td></tr>\n";
+}
+
+function payment_type_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+       global $pterm_types;
+       
+       echo "<tr><td class='label'>$label</td><td>";
+       echo array_selector($name, $selected_id, $pterm_types, 
+               array( 
+                       'select_submit'=> $submit_on_change
+               ) );
+       echo "</td></tr>\n";
+}
+
+function coa_list_row($label, $name, $value=null)
+{
+       global $path_to_root, $installed_extensions;
+
+       $path = $path_to_root.'/sql/';
+       $coas = array();
+       $sqldir = opendir($path);
+       while (false !== ($fname = readdir($sqldir)))
+       {
+               if (is_file($path.$fname) && substr($fname,-4)=='.sql' && @($fname[2] == '_'))
                {
-                       echo "<option value='$i'>$label</option>\n";
+                       $ext = array_search_value($fname, $installed_extensions, 'sql');
+                       if ($ext!=null) {
+                               $descr = $ext['name'];
+                       } elseif ($fname == 'en_US-new.sql') { // two standard COAs
+                               $descr = _("Standard new company American COA (4 digit)");
+                       } elseif ($fname == 'en_US-demo.sql') {
+                               $descr = _("Standard American COA (4 digit) with demo data");
+                       } else
+                               $descr = $fname;
+
+                       $coas[$fname] =  $descr;
                }
-    }
-       echo "</select>\n";
+       }
+       ksort($coas);
+
+       echo "<tr><td class='label'>$label</td>\n<td>";
+       echo array_selector( $name, $value, $coas );
+       echo "</td></tr>\n";
+}
+
+function payment_services($name)
+{
+       global $payment_services;
+
+       $services = (object)array_combine(array_keys($payment_services), array_keys($payment_services));
+
+       return array_selector($name, null, $services, array(
+                       'spec_option'=> _("No payment Link"),
+                       'spec_id' => '',
+               ));
+}
+
+function tax_algorithm_list($name, $value=null, $submit_on_change = false)
+{
+       global $tax_algorithms;
+       
+       return array_selector($name, $value, $tax_algorithms, 
+               array( 
+                       'select_submit'=> $submit_on_change,
+                       'async' => true,
+                       )
+       );
 }
 
-function number_list_cells($label, $name, $selected, $from, $to)
+function tax_algorithm_list_cells($label, $name, $value=null, $submit_on_change=false)
 {
        if ($label != null)
-               label_cell($label);
-       echo "<td>\n";
-       number_list($name, $selected, $from, $to);
+               echo "<td>$label</td>\n";
+       echo "<td>";
+       echo tax_algorithm_list($name, $value, $submit_on_change);
        echo "</td>\n";
 }
 
-function number_list_row($label, $name, $selected, $from, $to)
+function tax_algorithm_list_row($label, $name, $value=null, $submit_on_change=false)
 {
-       echo "<tr>\n";
-       number_list_cells($label, $name, $selected, $from, $to);
+       echo "<tr><td class='label'>$label</td>";
+       tax_algorithm_list_cells(null, $name, $value, $submit_on_change);
        echo "</tr>\n";
 }
-?>
\ No newline at end of file
+
+function refline_list($name, $type, $value=null, $spec_option=false)
+{
+       $sql = "SELECT id, prefix, inactive FROM ".TB_PREF."reflines";
+
+       $where = array();
+
+       if (isset($type))
+               $where = array('`trans_type`='.db_escape($type));
+
+       return combo_input($name, $value, $sql, 'id', 'prefix',
+               array(
+                       'order'=>array('prefix'),
+                       'spec_option' => $spec_option,
+                       'spec_id' => '',
+                       'type' => 2,
+                       'where' => $where,
+                       'select_submit' => true,
+                       )
+               );
+}
+
+function refline_list_row($label, $name, $type, $selected_id=null, $spec_option=false)
+{
+       echo "<tr>";
+       if ($label != null)
+               echo "<td class='label'>$label</td>\n";
+       echo "<td>";
+
+       echo refline_list($name, $type, $selected_id, $spec_option);
+       echo "</td></tr>\n";
+}
+
+
+//----------------------------------------------------------------------------------------------
+
+function subledger_list($name, $account, $selected_id=null)
+{
+
+       $type = is_subledger_account($account);
+       if (!$type)
+               return '';
+
+       if($type > 0)
+               $sql = "SELECT DISTINCT d.debtor_no as id, debtor_ref as name 
+               FROM "
+               .TB_PREF."debtors_master d,"
+               .TB_PREF."cust_branch c
+               WHERE d.debtor_no=c.debtor_no AND NOT d.inactive AND c.receivables_account=".db_escape($account);
+       else
+               $sql = "SELECT supplier_id as id, supp_ref as name 
+               FROM "
+               .TB_PREF."suppliers s
+               WHERE NOT s.inactive AND s.payable_account=".db_escape($account);
+
+       $mode = get_company_pref('no_customer_list');
+
+       return combo_input($name, $selected_id, $sql, 'id', 'name',
+       array(
+               'type' => 1,
+               'size' => 20,
+               'async' => false,
+       ) );
+}
+
+function subledger_list_cells($label, $name, $account, $selected_id=null)
+{
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td nowrap>";
+       echo subledger_list($name, $account, $selected_id);
+       echo "</td>\n";
+}
+
+function subledger_list_row($label, $name, $selected_id=null, $all_option = false, 
+       $submit_on_change=false, $show_inactive=false, $editkey = false)
+{
+       echo "<tr><td class='label'>$label</td><td nowrap>";
+       echo subledger_list($name, $account, $selected_id);
+       echo "</td>\n</tr>\n";
+}
+
+function accounts_type_list_row($label, $name, $selected_id=null)
+{
+       echo "<tr>";
+       if ($label != null)
+               echo "<td class='label'>$label</td>\n";
+       echo "<td>";
+       $sel = array(_("Numeric"), _("Alpha Numeric"), _("ALPHA NUMERIC"));
+       echo array_selector($name, $selected_id, $sel); 
+       echo "</td></tr>\n";
+}
+
+function users_list_cells($label, $name, $selected_id=null, $submit_on_change=false, $spec_opt=true)
+{
+    $where = false;
+       $sql = " SELECT user_id, IF(real_name = ' ', user_id, real_name) FROM ".TB_PREF."users";
+
+    if ($label != null)
+        echo "<td>$label</td>\n";
+    echo "<td>";
+
+    echo combo_input($name, $selected_id, $sql, 'user_id', 'real_name',
+        array(
+            'spec_option' => $spec_opt===true ?_("All users") : $spec_opt,
+            'spec_id' => '',
+            'order' => 'real_name',
+            'select_submit'=> $submit_on_change,
+            'async' => false
+        ) );
+    echo "</td>";
+
+}
+
+function collations_list_row($label, $name, $selected_id=null)
+{
+       global $supported_collations;
+
+       echo "<tr>";
+       if ($label != null)
+               echo "<td class='label'>$label</td>\n";
+       echo "<td>";
+
+       echo array_selector($name, $selected_id, $supported_collations, 
+               array('select_submit'=> false) );
+       echo "</td></tr>\n";
+}