Optimized database indexes.
[fa-stable.git] / includes / ui / ui_lists.inc
index bd411303ce3f9571ef0443882ec2f160a532f4c9..d84b0d9df04d6f310e4d9daf92192059b6128f0a 100644 (file)
@@ -10,7 +10,6 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 include_once($path_to_root . "/includes/banking.inc");
-include_once($path_to_root . "/includes/reserved.inc");
 include_once($path_to_root . "/includes/types.inc");
 include_once($path_to_root . "/includes/current_user.inc");
 
@@ -20,7 +19,7 @@ $_search_button = "<input %s type='submit' class='combo_submit' style='border:0;
 $_select_button = "<input %s type='submit' class='combo_select' style='border:0;background:url($path_to_root/themes/"
        ."%s/images/button_ok.png) no-repeat;%s' aspect='fallback' name='%s' value=' ' title='"._("Select")."'> ";
 
-$all_items = reserved_words::get_all();
+$all_items = ALL_TEXT;
 
 //----------------------------------------------------------------------------
 //     Universal sql combo generator
@@ -40,8 +39,8 @@ $opts = array(                // default options
        'spec_id' => 0,         // option id
                // submit on select parameters
        'default' => '', // default value when $_POST is not set
+       'multi' => false,       // multiple select
        'select_submit' => false, //submit on select: true/false
-       'edit_submit' => false, // call editor on F4
        'async' => true,        // select update via ajax (true) vs _page_body reload
                // search box parameters
        'sel_hint' => null,
@@ -54,6 +53,7 @@ $opts = array(                // default options
        'search_submit' => true, //search submit button: true/false
        'size' => 8,    // size and max of box tag
        'max' => 50,
+       'height' => false,      // number of lines in select box
        'cells' => false,       // combo displayed as 2 <td></td> cells
        'search' => array(), // sql field names to search
        'format' => null,        // format functions for regular options
@@ -69,13 +69,14 @@ $opts = array(              // default options
 
        $search_box = $opts['search_box']===true ? '_'.$name.'_edit' : $opts['search_box'];
        $search_submit = $opts['search_submit']===true ? '_'.$name.'_button' : $opts['search_submit'];
-       $select_submit =  $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit'];
+       $select_submit =  $opts['select_submit'];
        $spec_id = $opts['spec_id'];
        $spec_option = $opts['spec_option'];
        $by_id = ($opts['type'] == 0);
        $class = $by_id ? 'combo':'combo2';
        $disabled = $opts['disabled'] ? "disabled" : '';
-
+       $multi = $opts['multi'];
+       
        if(!count($opts['search'])) {
                $opts['search'] = array($by_id ? $valfield : $namefield);
        }
@@ -91,11 +92,14 @@ $opts = array(              // default options
        if ($selected_id == null) {
                $selected_id = get_post($name, $opts['default']);
        }
+       if(!is_array($selected_id))
+               $selected_id = array($selected_id); // code is generalized for multiple selection support
+
        $txt = get_post($search_box);
        $rel = '';
        $limit = '';
 
-       if (isset($_POST[$select_submit])) {
+       if (isset($_POST['_'.$name.'_update'])) {
                if ($by_id) $txt = $_POST[$name];
 
                if (!$opts['async'])
@@ -109,14 +113,14 @@ $opts = array(            // default options
        $rel = "rel='$search_box'"; // set relation to list
    if ($opts['search_submit']) {
        if (isset($_POST[$search_submit])) {
-               $selected_id = ''; // ignore selected_id while search
+               $selected_id = array(); // ignore selected_id while search
                if (!$opts['async'])
                        $Ajax->activate('_page_body');
                else
                        $Ajax->activate($name);
        }
        if ($txt == '') {
-               if ($spec_option === false && $selected_id==null)
+               if ($spec_option === false && $selected_id == array())
                  $limit = ' LIMIT 1';
                else
                  $opts['where'][] = $valfield . "='". get_post($name, $spec_id)."'";
@@ -159,12 +163,12 @@ $opts = array(            // default options
                while ($contact_row = db_fetch($result)) {
                        $value = $contact_row[0];
                        $descr = $opts['format']==null ?  $contact_row[1] :
-                       call_user_func($opts['format'], $contact_row);
+                               call_user_func($opts['format'], $contact_row);
                        $sel = '';
                        if (get_post($search_submit) && ($txt === $value)) {
-                               $selected_id = $value;
+                               $selected_id[] = $value;
                        }
-                       if      ((string)($selected_id) === $value) {
+                       if (in_array($value, $selected_id)) {
                                $sel = 'selected';
                                $found = $value;
                        }
@@ -200,18 +204,19 @@ $opts = array(            // default options
                        . $selector;
        }
 
-       if ($found === false) {
-               $selected_id = $first_id;
+       if ($found===false) {
+               $selected_id = array($first_id);
        }
-       $_POST[$name] = $selected_id;
+       $_POST[$name] = $multi ? $selected_id : $selected_id[0];
 
        if ($by_id && $search_box != false) {
                $txt = $found;
                $Ajax->addUpdate($name, $search_box, $txt ? $txt : '');
        }
-       $aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
-       $selector = "<select $disabled name='$name' class='$class' title='"
-               . $opts['sel_hint']."'$aspect $rel>".$selector."</select>\n";
+       $selector = "<select ".($multi ? "multiple" : '')
+               . ($opts['height']!==false ? ' size="'.$opts['height'].'"' : '')
+               . "$disabled name='$name".($multi ? '[]':'')."' class='$class' title='"
+               . $opts['sel_hint']."' $rel>".$selector."</select>\n";
 
        $Ajax->addUpdate($name, "_{$name}_sel", $selector);
 
@@ -224,7 +229,7 @@ $opts = array(              // default options
        // button class selects form reload/ajax selector update
                $selector .= sprintf($_select_button, $disabled, user_theme(),
                        (fallback_mode() ? '' : 'display:none;'),
-                       $select_submit)."\n";
+                        '_'.$name.'_update')."\n";
        }
 // ------ make combo ----------
 
@@ -244,12 +249,11 @@ $opts = array(            // default options
                }
        }
        default_focus(($search_box && $by_id) ? $search_box : $name);
-       $str = $selector;
+
        if ($search_box && $opts['cells'])
-               echo ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector</td>";
+               $str = ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector</td>";
        else
-               echo $edit_entry.$selector;
-
+               $str = $edit_entry.$selector;
        return $str;
 }
 
@@ -274,26 +278,30 @@ $opts = array(            // default options
        'spec_option'=>false,   // option text or false
        'spec_id' => 0,         // option id
        'select_submit' => false, //submit on select: true/false
-       'edit_submit' => false, // call editor on F4
        'async' => true,        // select update via ajax (true) vs _page_body reload
        'default' => '', // default value when $_POST is not set
+       'multi'=>false, // multiple select
                // search box parameters
+       'height' => false,      // number of lines in select box
        'sel_hint' => null,
        'disabled' => false
 );
 // ------ merge options with defaults ----------
        if($options != null)
                $opts = array_merge($opts, $options);
-       $select_submit =  $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit'];
+       $select_submit =  $opts['select_submit'];
        $spec_id = $opts['spec_id'];
        $spec_option = $opts['spec_option'];
        $disabled = $opts['disabled'] ? "disabled" : '';
+       $multi = $opts['multi'];
 
        if ($selected_id == null) {
                $selected_id = get_post($name, $opts['default']);
        }
+       if(!is_array($selected_id))
+               $selected_id = array($selected_id); // code is generalized for multiple selection support
 
-       if (isset($_POST[$select_submit])) {
+       if (isset($_POST[ '_'.$name.'_update'])) {
                if (!$opts['async'])
                        $Ajax->activate('_page_body');
                else
@@ -307,7 +315,7 @@ $opts = array(              // default options
 //if($name=='SelectStockFromList') display_error($sql);
                foreach($items as $value=>$descr) {
                        $sel = '';
-                       if ((string)$selected_id === (string)$value) {
+                       if (in_array((string)$value, $selected_id)) {
                                $sel = 'selected';
                                $found = $value;
                        }
@@ -327,14 +335,14 @@ $opts = array(            // default options
                        . $selector;
        }
 
-       if ($found === false) {
-               $selected_id = $first_id;
+       if ($found===false) {
+               $selected_id = array($first_id);
        }
-       $_POST[$name] = $selected_id;
-
-       $aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
-       $selector = "<select $disabled name='$name' class='combo' title='"
-               . $opts['sel_hint']."'$aspect >".$selector."</select>\n";
+       $_POST[$name] = $multi ? $selected_id : $selected_id[0];
+       $selector = "<select ".($multi  ? "multiple" : '')
+               . ($opts['height']!==false ? ' size="'.$opts['height'].'"' : '')
+               . "$disabled name='$name".($multi ? '[]' : '')."' class='combo' title='"
+               . $opts['sel_hint']."'>".$selector."</select>\n";
 
        $Ajax->addUpdate($name, "_{$name}_sel", $selector);
 
@@ -344,10 +352,9 @@ $opts = array(             // default options
                global $_select_button;
                $selector .= sprintf($_select_button, $disabled, user_theme(),
                        (fallback_mode() ? '' : 'display:none;'),
-                       $select_submit)."\n";
+                        '_'.$name.'_update')."\n";
        }
        default_focus($name);
-       echo $selector;
 
        return $selector;
 }
@@ -366,19 +373,22 @@ function _format_add_curr($row)
 }
 
 function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
-       $all=false)
+       $all=false, $editkey = false)
 {
        global $all_items;
 
-       $sql = "SELECT supplier_id, supp_name, curr_code, inactive FROM ".TB_PREF."suppliers ";
+       $sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers ";
 
        $mode = get_company_pref('no_supplier_list');
 
+       if ($editkey)
+               set_editor('supplier', $name, $editkey);
+               
        return combo_input($name, $selected_id, $sql, 'supplier_id', 'supp_name',
        array(
                'format' => '_format_add_curr',
+           'order' => array('supp_ref'),
                'search_box' => $mode!=0,
-               'edit_submit' => true, 
                'type' => 1,
                'spec_option' => $spec_option === true ? _("All Suppliers") : $spec_option,
                'spec_id' => $all_items,
@@ -391,85 +401,92 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
 }
 
 function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, 
-       $submit_on_change=false, $all=false)
+       $submit_on_change=false, $all=false, $editkey = false)
 {
        if ($label != null)
                echo "<td>$label</td><td>\n";
-       $str = supplier_list($name, $selected_id, $all_option, $submit_on_change, $all);
+               echo supplier_list($name, $selected_id, $all_option, $submit_on_change, 
+               $all, $editkey);
                echo "</td>\n";
-       return $str;
 }
 
-function supplier_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false)
+function supplier_list_row($label, $name, $selected_id=null, $all_option = false, 
+       $submit_on_change=false, $all=false, $editkey = false)
 {
-echo "<tr><td>$label</td><td>";
-       $str = supplier_list($name, $selected_id, $all_option, $submit_on_change );
-echo "</td></tr>\n";
-return $str;
+       echo "<tr><td>$label</td><td>";
+       echo supplier_list($name, $selected_id, $all_option, $submit_on_change,
+               $all, $editkey);
+       echo "</td></tr>\n";
 }
 //----------------------------------------------------------------------------------------------
 
-function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, $show_inactive=false)
+function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, 
+       $show_inactive=false, $editkey = false)
 {
        global $all_items;
 
-       $sql = "SELECT debtor_no, name, curr_code, inactive FROM ".TB_PREF."debtors_master ";
+       $sql = "SELECT debtor_no, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master ";
 
        $mode = get_company_pref('no_customer_list');
 
-return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
+       if ($editkey)
+               set_editor('customer', $name, $editkey);
+
+       return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
        array(
            'format' => '_format_add_curr',
+           'order' => array('debtor_ref'),
                'search_box' => $mode!=0,
                'type' => 1,
                'size' => 20,
                'spec_option' => $spec_option === true ? _("All Customers") : $spec_option,
                'spec_id' => $all_items,
                'select_submit'=> $submit_on_change,
-               'edit_submit' => true, // call editor on F4
                'async' => false,
-               'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F4 - entry new customer') :
+               'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F2 - entry new customer') :
                _('Select customer'),
                'show_inactive' => $show_inactive
        ) );
 }
 
 function customer_list_cells($label, $name, $selected_id=null, $all_option=false, 
-       $submit_on_change=false, $show_inactive=false)
+       $submit_on_change=false, $show_inactive=false, $editkey = false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td nowrap>";
-       $str = customer_list($name, $selected_id, $all_option, $submit_on_change,
-               $show_inactive);
+       echo customer_list($name, $selected_id, $all_option, $submit_on_change,
+               $show_inactive, $editkey);
        echo "</td>\n";
-       return $str;
 }
 
 function customer_list_row($label, $name, $selected_id=null, $all_option = false, 
-       $submit_on_change=false, $show_inactive=false)
+       $submit_on_change=false, $show_inactive=false, $editkey = false)
 {
        echo "<tr><td>$label</td><td nowrap>";
-       $str = customer_list($name, $selected_id, $all_option, $submit_on_change,
-               $show_inactive);
+       echo customer_list($name, $selected_id, $all_option, $submit_on_change,
+               $show_inactive, $editkey);
        echo "</td>\n</tr>\n";
-       return $str;
 }
 
 //------------------------------------------------------------------------------------------------
 
 function customer_branches_list($customer_id, $name, $selected_id=null,
-       $spec_option = true, $enabled=true, $submit_on_change=false)
+       $spec_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
 {
        global $all_items;
 
-       $sql = "SELECT branch_code, br_name FROM ".TB_PREF."cust_branch
+       $sql = "SELECT branch_code, branch_ref FROM ".TB_PREF."cust_branch
                WHERE debtor_no='" . $customer_id . "' ";
 
+       if ($editkey)
+               set_editor('branch', $name, $editkey);
+
        $where = $enabled ? array("disable_trans = 0") : array();
-return  combo_input($name, $selected_id, $sql, 'branch_code', 'br_name',
+       return  combo_input($name, $selected_id, $sql, 'branch_code', 'br_name',
        array(
                'where' => $where,
+               'order' => array('branch_ref'),
                'spec_option' => $spec_option === true ? _('All branches') : $spec_option,
                'spec_id' => $all_items,
                'select_submit'=> $submit_on_change,
@@ -478,22 +495,24 @@ return  combo_input($name, $selected_id, $sql, 'branch_code', 'br_name',
 }
 //------------------------------------------------------------------------------------------------
 
-function customer_branches_list_cells($label,$customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false)
+function customer_branches_list_cells($label,$customer_id, $name, $selected_id=null, 
+       $all_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $ret = customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
+       echo customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled, 
+               $submit_on_change, $editkey);
        echo "</td>\n";
-       return $ret;
 }
 
-function customer_branches_list_row($label,$customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false)
+function customer_branches_list_row($label, $customer_id, $name, $selected_id=null, 
+       $all_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
 {
        echo "<tr>";
-       $ret = customer_branches_list_cells($label, $customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change);
+       customer_branches_list_cells($label, $customer_id, $name, $selected_id, 
+               $all_option, $enabled, $submit_on_change, $editkey);
        echo "</tr>";
-       return $ret;
 }
 
 //------------------------------------------------------------------------------------------------
@@ -517,17 +536,15 @@ function locations_list_cells($label, $name, $selected_id=null, $all_option=fals
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = locations_list($name, $selected_id, $all_option, $submit_on_change);
+       echo locations_list($name, $selected_id, $all_option, $submit_on_change);
        echo "</td>\n";
-       return $str;
 }
 
 function locations_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
 {
        echo "<tr>";
-       $str = locations_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
+       locations_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
        echo "</tr>\n";
-       return $str;
 }
 
 //-----------------------------------------------------------------------------------------------
@@ -551,17 +568,15 @@ function currencies_list_cells($label, $name, $selected_id=null, $submit_on_chan
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = currencies_list($name, $selected_id, $submit_on_change);
+       echo currencies_list($name, $selected_id, $submit_on_change);
        echo "</td>\n";
-       return $str;
 }
 
 function currencies_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
        echo "<tr>\n";
-       $str = currencies_list_cells($label, $name, $selected_id, $submit_on_change);
+       currencies_list_cells($label, $name, $selected_id, $submit_on_change);
        echo "</tr>\n";
-       return $str;
 }
 
 //---------------------------------------------------------------------------------------------------
@@ -594,17 +609,15 @@ function fiscalyears_list_cells($label, $name, $selected_id=null)
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = fiscalyears_list($name, $selected_id);
+       echo fiscalyears_list($name, $selected_id);
        echo "</td>\n";
-       return $str;
 }
 
 function fiscalyears_list_row($label, $name, $selected_id=null)
 {
        echo "<tr>\n";
-       $str = fiscalyears_list_cells($label, $name, $selected_id);
+       fiscalyears_list_cells($label, $name, $selected_id);
        echo "</tr>\n";
-       return $str;
 }
 //------------------------------------------------------------------------------------
 
@@ -635,31 +648,32 @@ function dimensions_list_cells($label, $name, $selected_id=null, $no_option=fals
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = dimensions_list($name, $selected_id, $no_option, $showname, $submit_on_change, $showclosed, $showtype);
+       echo dimensions_list($name, $selected_id, $no_option, $showname, $submit_on_change, $showclosed, $showtype);
        echo "</td>\n";
-       return $str;
 }
 
 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";
-       $str = dimensions_list_cells($label, $name, $selected_id, $no_option, $showname,
+       dimensions_list_cells($label, $name, $selected_id, $no_option, $showname,
                $showclosed, $showtype, $submit_on_change);
        echo "</tr>\n";
-       return $str;
 }
 
 //---------------------------------------------------------------------------------------------------
 
 function stock_items_list($name, $selected_id=null, $all_option=false, 
-       $submit_on_change=false, $opts=array())
+       $submit_on_change=false, $opts=array(), $editkey = false)
 {
        global $all_items;
 
        $sql = "SELECT stock_id, s.description, c.description, s.inactive
                        FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id";
 
+       if ($editkey)
+               set_editor('item', $name, $editkey);
+
        return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
        array_merge(
          array(
@@ -682,21 +696,19 @@ function _format_stock_items($row)
 }
 
 function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, 
-       $submit_on_change=false, $all=false)
+       $submit_on_change=false, $all=false, $editkey = false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
-       $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('cells'=>true, 'show_inactive'=>$all));
-       return $str;
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array('cells'=>true, 'show_inactive'=>$all), $editkey);
 }
 /*
 function stock_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
 {
        echo "<tr>\n";
-       $str = stock_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
+       stock_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
        echo "</tr>\n";
-       return $str;
 }
 */
 //---------------------------------------------------------------------------------------------------
@@ -734,7 +746,7 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
                'spec_option' => $all_option===true ?  _("All Items") : $all_option,
                'spec_id' => $all_items,
                'search_box' => true,
-               'search' => array("i.item_code", "i.description"),
+               '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,
@@ -747,16 +759,14 @@ function sales_items_list_cells($label, $name, $selected_id=null, $all_option=fa
 {
        if ($label != null)
                echo "<td>$label</td>\n";
-       $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change,
+       echo sales_items_list($name, $selected_id, $all_option, $submit_on_change,
                '', array('cells'=>true));
-       return $str;
 }
 
 function sales_kits_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
 {
-       $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change,
+       return sales_items_list($name, $selected_id, $all_option, $submit_on_change,
                'kits', array('cells'=>false));
-       return $str;
 }
 
 function sales_local_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
@@ -765,20 +775,17 @@ function sales_local_items_list_row($label, $name, $selected_id=null, $all_optio
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change,
+       echo sales_items_list($name, $selected_id, $all_option, $submit_on_change,
                'local', array('cells'=>false));
        echo "</td></tr>";
-       return $str;
 }
 //------------------------------------------------------------------------------------
 
 function stock_manufactured_items_list($name, $selected_id=null,
        $all_option=false, $submit_on_change=false)
 {
-       $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("mb_flag= 'M'"), 
-                       'edit_submit' => true));
-       return $str;            
+       return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array('where'=>array("mb_flag= 'M'")));
 }
 
 function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
@@ -787,46 +794,42 @@ function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = stock_manufactured_items_list($name, $selected_id, $all_option, $submit_on_change);
+       echo stock_manufactured_items_list($name, $selected_id, $all_option, $submit_on_change);
        echo "</td>\n";
-       return $str;
 }
 
 function stock_manufactured_items_list_row($label, $name, $selected_id=null,
                $all_option=false, $submit_on_change=false)
 {
        echo "<tr>\n";
-       $str = stock_manufactured_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
+       stock_manufactured_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
        echo "</tr>\n";
-       return $str;
 }
 //------------------------------------------------------------------------------------
 
 function stock_component_items_list($name, $parent_stock_id, $selected_id=null,
-       $all_option=false, $submit_on_change=false)
+       $all_option=false, $submit_on_change=false, $editkey = false)
 {
-       $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("stock_id != '$parent_stock_id'")));
-       return $str;
+       return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array('where'=>array("stock_id != '$parent_stock_id'")), $editkey);
 }
 
 function stock_component_items_list_cells($label, $name, $parent_stock_id, 
-       $selected_id=null, $all_option=false, $submit_on_change=false)
+       $selected_id=null, $all_option=false, $submit_on_change=false, $editkey = false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
-       $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true));
-       return $str;
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true),
+               $editkey);
 }
 //------------------------------------------------------------------------------------
 
 function stock_costable_items_list($name, $selected_id=null,
        $all_option=false, $submit_on_change=false)
 {
-       $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+       return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
                array('where'=>array("mb_flag!='D'")));
-       return $str;
 }
 
 function stock_costable_items_list_cells($label, $name, $selected_id=null, 
@@ -834,42 +837,36 @@ function stock_costable_items_list_cells($label, $name, $selected_id=null,
 {
        if ($label != null)
                echo "<td>$label</td>\n";
-       $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
                array('where'=>array("mb_flag!='D'"), 'cells'=>true));
-       return $str;
 }
 
 //------------------------------------------------------------------------------------
 function stock_purchasable_items_list($name, $selected_id=null,        
-       $all_option=false, $submit_on_change=false, $all=false)
+       $all_option=false, $submit_on_change=false, $all=false, $editkey=false)
 {
-       $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+       return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
                array('where'=>array("mb_flag!= 'M'"), 
-                       'edit_submit' => true,
-                       'show_inactive'=>$all));
-       return $str;
+                       'show_inactive'=>$all), $editkey);
 }
 
 function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
-                       $all_option=false, $submit_on_change=false, $all=false)
+                       $all_option=false, $submit_on_change=false, $editkey=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
-       $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
                array('where'=>array("mb_flag!= 'M'"), 
-                        'edit_submit' => true,
-                        'cells'=>true));
-       return $str;
+                        'cells'=>true), $editkey);
 }
 
 function stock_purchasable_items_list_row($label, $name, $selected_id=null,
-                       $all_option=false, $submit_on_change=false)
+                       $all_option=false, $submit_on_change=false, $editkey=false)
 {
        echo "<tr>\n";
-       $ret = stock_purchasable_items_list_cells($label, $name, $selected_id=null,
-               $all_option, $submit_on_change);
+       stock_purchasable_items_list_cells($label, $name, $selected_id=null,
+               $all_option, $submit_on_change, $editkey);
        echo "</tr>\n";
-       return $ret;
 }
 
 //------------------------------------------------------------------------------------
@@ -883,7 +880,7 @@ function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=tr
                echo "<td>$label</td>\n";
        echo "<td>";
 
-       array_selector($name, $selected_id, $stock_types, 
+       echo array_selector($name, $selected_id, $stock_types, 
                array( 
                        'select_submit'=> true, 
                        'disabled' => !$enabled) );
@@ -901,7 +898,7 @@ function stock_units_list_row($label, $name, $value=null, $enabled=true)
        while($unit = db_fetch($result))
                $units[$unit['abbr']] = $unit['name'];
 
-       array_selector($name, $value, $units, array( 'disabled' => !$enabled) );
+       echo array_selector($name, $value, $units, array( 'disabled' => !$enabled) );
 
        echo "</td></tr>\n";
 }
@@ -915,7 +912,7 @@ function tax_types_list($name, $selected_id=null, $none_option=false, $submit_on
        return combo_input($name, $selected_id, $sql, 'id', 'name',
        array(
                'spec_option' => $none_option,
-               'spec_id' => reserved_words::get_all_numeric(),
+               'spec_id' => ALL_NUMERIC,
                'select_submit'=> $submit_on_change,
                'async' => false,
        ) );
@@ -927,18 +924,16 @@ function tax_types_list_cells($label, $name, $selected_id=null, $none_option=fal
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = tax_types_list($name, $selected_id, $none_option, $submit_on_change);
+       echo tax_types_list($name, $selected_id, $none_option, $submit_on_change);
        echo "</td>\n";
-       return $str;
 }
 
 function tax_types_list_row($label, $name, $selected_id=null, $none_option=false,
        $submit_on_change=false)
 {
        echo "<tr>\n";
-       $str = tax_types_list_cells($label, $name, $selected_id, $none_option, $submit_on_change);
+       tax_types_list_cells($label, $name, $selected_id, $none_option, $submit_on_change);
        echo "</tr>\n";
-       return $str;
 }
 
 //------------------------------------------------------------------------------------
@@ -952,7 +947,7 @@ function tax_groups_list($name, $selected_id=null,
        array(
                'order' => 'id',
                'spec_option' => $none_option,
-               'spec_id' => reserved_words::get_all_numeric(),
+               'spec_id' => ALL_NUMERIC,
                'select_submit'=> $submit_on_change,
                'async' => false,
        ) );
@@ -963,17 +958,15 @@ function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=fa
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = tax_groups_list($name, $selected_id, $none_option, $submit_on_change);
+       echo tax_groups_list($name, $selected_id, $none_option, $submit_on_change);
        echo "</td>\n";
-       return $str;
 }
 
 function tax_groups_list_row($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
 {
        echo "<tr>\n";
-       $str = tax_groups_list_cells($label, $name, $selected_id, $none_option, $submit_on_change);
+       tax_groups_list_cells($label, $name, $selected_id, $none_option, $submit_on_change);
        echo "</tr>\n";
-       return $str;
 }
 
 //------------------------------------------------------------------------------------
@@ -981,7 +974,7 @@ function tax_groups_list_row($label, $name, $selected_id=null, $none_option=fals
 function item_tax_types_list($name, $selected_id=null)
 {
        $sql ="SELECT id, name FROM ".TB_PREF."item_tax_types";
-       combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') );
+       return combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') );
 }
 
 function item_tax_types_list_cells($label, $name, $selected_id=null)
@@ -989,7 +982,7 @@ function item_tax_types_list_cells($label, $name, $selected_id=null)
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       item_tax_types_list($name, $selected_id);
+       echo item_tax_types_list($name, $selected_id);
        echo "</td>\n";
 }
 
@@ -1005,7 +998,8 @@ function item_tax_types_list_row($label, $name, $selected_id=null)
 function shippers_list($name, $selected_id=null)
 {
        $sql = "SELECT shipper_id, shipper_name, inactive FROM ".TB_PREF."shippers";
-       combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', array());
+       return combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', 
+               array('order'=>array('shipper_name')));
 }
 
 function shippers_list_cells($label, $name, $selected_id=null)
@@ -1013,7 +1007,7 @@ function shippers_list_cells($label, $name, $selected_id=null)
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       shippers_list($name, $selected_id);
+       echo shippers_list($name, $selected_id);
        echo "</td>\n";
 }
 
@@ -1026,25 +1020,28 @@ function shippers_list_row($label, $name, $selected_id=null)
 
 //-------------------------------------------------------------------------------------
 
-function sales_persons_list($name, $selected_id=null)
+function sales_persons_list($name, $selected_id=null, $spec_opt=false)
 {
        $sql = "SELECT salesman_code, salesman_name, inactive FROM ".TB_PREF."salesman";
-       combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', array());
+       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 sales_persons_list_cells($label, $name, $selected_id=null)
+function sales_persons_list_cells($label, $name, $selected_id=null, $spec_opt=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>\n";
-       sales_persons_list($name, $selected_id);
+       echo sales_persons_list($name, $selected_id, $spec_opt);
        echo "</td>\n";
 }
 
-function sales_persons_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+function sales_persons_list_row($label, $name, $selected_id=null, $spec_opt=false)
 {
        echo "<tr>\n";
-       sales_persons_list_cells($label, $name, $selected_id, $submit_on_change=false);
+       sales_persons_list_cells($label, $name, $selected_id, $spec_opt);
        echo "</tr>\n";
 }
 
@@ -1053,7 +1050,7 @@ function sales_persons_list_row($label, $name, $selected_id=null, $submit_on_cha
 function sales_areas_list($name, $selected_id=null)
 {
        $sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas";
-       combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
+       return combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
 }
 
 function sales_areas_list_cells($label, $name, $selected_id=null)
@@ -1061,7 +1058,7 @@ function sales_areas_list_cells($label, $name, $selected_id=null)
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       sales_areas_list($name, $selected_id);
+       echo sales_areas_list($name, $selected_id);
        echo "</td>\n";
 }
 
@@ -1077,7 +1074,7 @@ function sales_areas_list_row($label, $name, $selected_id=null)
 function sales_groups_list($name, $selected_id=null, $special_option=false)
 {
        $sql = "SELECT id, description, inactive FROM ".TB_PREF."groups";
-       combo_input($name, $selected_id, $sql, 'id', 'description', array(
+       return combo_input($name, $selected_id, $sql, 'id', 'description', array(
                'spec_option' => $special_option===true ? ' ' : $special_option,
                'order' => 'description', 'spec_id' => 0,
        ));
@@ -1088,7 +1085,7 @@ function sales_groups_list_cells($label, $name, $selected_id=null, $special_opti
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       sales_groups_list($name, $selected_id, $special_option);
+       echo sales_groups_list($name, $selected_id, $special_option);
        echo "</td>\n";
 }
 
@@ -1111,7 +1108,7 @@ function templates_list($name, $selected_id=null, $special_option=false)
        $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";
-       combo_input($name, $selected_id, $sql, 'order_no', 'OrderValue', array(
+       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,
@@ -1123,7 +1120,7 @@ function templates_list_cells($label, $name, $selected_id=null, $special_option=
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       templates_list($name, $selected_id, $special_option);
+       echo templates_list($name, $selected_id, $special_option);
        echo "</td>\n";
 }
 
@@ -1139,7 +1136,7 @@ function templates_list_row($label, $name, $selected_id=null, $special_option=fa
 function workorders_list($name, $selected_id=null)
 {
        $sql = "SELECT id, wo_ref FROM ".TB_PREF."workorders WHERE closed=0";
-       combo_input($name, $selected_id, $sql, 'id', 'wo_ref', array());
+       return combo_input($name, $selected_id, $sql, 'id', 'wo_ref', array());
 }
 
 function workorders_list_cells($label, $name, $selected_id=null)
@@ -1147,7 +1144,7 @@ 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";
 }
 
@@ -1163,7 +1160,7 @@ function workorders_list_row($label, $name, $selected_id=null)
 function payment_terms_list($name, $selected_id=null)
 {
        $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
-       combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array());
+       return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array());
 }
 
 function payment_terms_list_cells($label, $name, $selected_id=null)
@@ -1171,7 +1168,7 @@ 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";
 }
 
@@ -1187,7 +1184,7 @@ function payment_terms_list_row($label, $name, $selected_id=null)
 function credit_status_list($name, $selected_id=null)
 {
        $sql ="SELECT id, reason_description, inactive FROM ".TB_PREF."credit_status";
-       combo_input($name, $selected_id, $sql, 'id', 'reason_description', array());
+       return combo_input($name, $selected_id, $sql, 'id', 'reason_description', array());
 }
 
 function credit_status_list_cells($label, $name, $selected_id=null)
@@ -1195,7 +1192,7 @@ 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";
 }
 
@@ -1226,17 +1223,15 @@ function sales_types_list_cells($label, $name, $selected_id=null, $submit_on_cha
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = 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";
-       return $str;
 }
 
 function sales_types_list_row($label, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
 {
        echo "<tr>\n";
-       $str = sales_types_list_cells($label, $name, $selected_id, $submit_on_change, $special_option);
+       sales_types_list_cells($label, $name, $selected_id, $submit_on_change, $special_option);
        echo "</tr>\n";
-       return $str;
 }
 
 //-----------------------------------------------------------------------------------------------
@@ -1244,7 +1239,7 @@ function sales_types_list_row($label, $name, $selected_id=null, $submit_on_chang
 function movement_types_list($name, $selected_id=null)
 {
        $sql = "SELECT id, name FROM ".TB_PREF."movement_types";
-       combo_input($name, $selected_id, $sql, 'id', 'name', array());
+       return combo_input($name, $selected_id, $sql, 'id', 'name', array());
 }
 
 function movement_types_list_cells($label, $name, $selected_id=null)
@@ -1252,7 +1247,7 @@ function movement_types_list_cells($label, $name, $selected_id=null)
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       movement_types_list($name, $selected_id);
+       echo movement_types_list($name, $selected_id);
        echo "</td>\n";
 }
 
@@ -1274,7 +1269,7 @@ function bank_reconciliation_list($account, $name, $selected_id=null, $submit_on
        $sql = "SELECT reconciled, reconciled FROM ".TB_PREF."bank_trans
                WHERE bank_act=".db_escape($account)." AND reconciled IS NOT NULL
                GROUP BY reconciled";
-       combo_input($name, $selected_id, $sql, 'id', 'reconciled',
+       return combo_input($name, $selected_id, $sql, 'id', 'reconciled',
        array(
                'spec_option' => $special_option,
                'format' => '_format_date',
@@ -1288,7 +1283,7 @@ function bank_reconciliation_list_cells($label,$account, $name, $selected_id=nul
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       bank_reconciliation_list($account, $name, $selected_id, $submit_on_change, $special_option);
+       echo bank_reconciliation_list($account, $name, $selected_id, $submit_on_change, $special_option);
        echo "</td>\n";
 }
 /*
@@ -1320,7 +1315,7 @@ function workcenter_list_cells($label, $name, $selected_id=null, $all_option=fal
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       workcenter_list($name, $selected_id, $all_option);
+       echo workcenter_list($name, $selected_id, $all_option);
        echo "</td>\n";
 }
 
@@ -1337,8 +1332,6 @@ function bank_accounts_list($name, $selected_id=null, $submit_on_change=false)
 {
        $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive
                FROM ".TB_PREF."bank_accounts";
-//             , ".TB_PREF."chart_master
-//             WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
 
        return combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
        array(
@@ -1353,17 +1346,15 @@ function bank_accounts_list_cells($label, $name, $selected_id=null, $submit_on_c
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = bank_accounts_list($name, $selected_id, $submit_on_change);
+       echo bank_accounts_list($name, $selected_id, $submit_on_change);
        echo "</td>\n";
-       return $str;
 }
 
 function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
        echo "<tr>\n";
-       $str = bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change);
+       bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change);
        echo "</tr>\n";
-       return $str;
 }
 //-----------------------------------------------------------------------------------------------
 
@@ -1376,14 +1367,13 @@ function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha
        if ($label != null)
                echo "<tr><td>$label</td>\n";
        echo "<td>";
-       $str = combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
+       echo combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
        array(
                'format' => '_format_add_curr',
                'select_submit'=> $submit_on_change,
                'async' => true
        ) );
        echo "</td></tr>\n";
-       return $str;
 }
 //-----------------------------------------------------------------------------------------------
 
@@ -1397,16 +1387,16 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub
                echo "<td>$label</td>\n";
        echo "<td>";
 
-       $str = combo_input($name, $selected_id, $sql, 'id', 'pos_name',
+       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";
 
-       return $str;    
 }
 //-----------------------------------------------------------------------------------------------
 
@@ -1415,9 +1405,8 @@ function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_ch
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = yesno_list($name, $selected_id, _('Cash'), _('Delayed'), $submit_on_change);
+       echo yesno_list($name, $selected_id, _('Cash'), _('Delayed'), $submit_on_change);
        echo "</td>\n";
-       return $str;
 }
 //-----------------------------------------------------------------------------------------------
 
@@ -1438,56 +1427,55 @@ function class_list_cells($label, $name, $selected_id=null, $submit_on_change=fa
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = class_list($name, $selected_id, $submit_on_change);
+       echo class_list($name, $selected_id, $submit_on_change);
        echo "</td>\n";
-       return $str;
 }
 
 function class_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
        echo "<tr>\n";
-       $str = class_list_cells($label, $name, $selected_id, $submit_on_change);
+       class_list_cells($label, $name, $selected_id, $submit_on_change);
        echo "</tr>\n";
-       return $str;
 }
 
 //-----------------------------------------------------------------------------------------------
-
-function stock_categories_list($name, $selected_id=null, $submit_on_change=false)
+function stock_categories_list($name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
 {
        $sql = "SELECT category_id, description, inactive FROM ".TB_PREF."stock_category";
-       combo_input($name, $selected_id, $sql, 'category_id', 'description',
+       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
        ));
 }
 
-function stock_categories_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
+function stock_categories_list_cells($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       stock_categories_list($name, $selected_id, $submit_on_change);
+       echo stock_categories_list($name, $selected_id, $spec_opt, $submit_on_change);
        echo "</td>\n";
 }
 
-function stock_categories_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+function stock_categories_list_row($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
 {
        echo "<tr>\n";
-       stock_categories_list_cells($label, $name, $selected_id, $submit_on_change);
+       stock_categories_list_cells($label, $name, $selected_id, $spec_opt, $submit_on_change);
        echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------------------
 
-function gl_account_types_list($name, $selected_id=null, $all_option, $all_option_numeric)
+function gl_account_types_list($name, $selected_id=null, $all_option=false, $all_option_numeric=true)
 {
        global $all_items;
 
        $sql = "SELECT id, name FROM ".TB_PREF."chart_types";
 
-       combo_input($name, $selected_id, $sql, 'id', 'name',
+       return combo_input($name, $selected_id, $sql, 'id', 'name',
        array(
                'order' => 'id',
                'spec_option' =>$all_option,
@@ -1501,7 +1489,7 @@ function gl_account_types_list_cells($label, $name, $selected_id=null, $all_opti
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       gl_account_types_list($name, $selected_id, $all_option, $all_option_numeric);
+       echo gl_account_types_list($name, $selected_id, $all_option, $all_option_numeric);
        echo "</td>\n";
 }
 
@@ -1519,23 +1507,23 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
        $cells=false, $all_option=false, $submit_on_change=false, $all=false)
 {
        if ($skip_bank_accounts)
-               $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive
+               $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
                        FROM (".TB_PREF."chart_master chart,".TB_PREF."chart_types type) "
                        ."LEFT JOIN ".TB_PREF."bank_accounts acc "
                        ."ON chart.account_code=acc.account_code
                                WHERE acc.account_code  IS NULL
                        AND chart.account_type=type.id";
        else
-               $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive
+               $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
                        FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type
                        WHERE chart.account_type=type.id";
 
-       combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name',
+       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' => '',
-               'order' => array('name','account_code'),
+               'order' => array('type.id','account_code'),
                'search_box' => $cells,
                        'search_submit' => false,
                        'size' => 12,
@@ -1561,7 +1549,7 @@ function gl_all_accounts_list_cells($label, $name, $selected_id=null,
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       gl_all_accounts_list($name, $selected_id, 
+       echo gl_all_accounts_list($name, $selected_id, 
                $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all);
        echo "</td>\n";
 }
@@ -1592,17 +1580,15 @@ function yesno_list_cells($label, $name, $selected_id=null, $name_yes="", $name_
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = 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";
-       return $str;
 }
 
 function yesno_list_row($label, $name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false)
 {
        echo "<tr>\n";
-       $str = yesno_list_cells($label, $name, $selected_id, $name_yes, $name_no, $submit_on_change);
+       yesno_list_cells($label, $name, $selected_id, $name_yes, $name_no, $submit_on_change);
        echo "</tr>\n";
-       return $str;
 }
 
 //------------------------------------------------------------------------------------------------
@@ -1615,7 +1601,7 @@ function languages_list($name, $selected_id=null)
        foreach ($installed_languages as $lang)
                        $items[$lang['code']] = $lang['name'];
        
-       return array_selector($name, $selected_id, $items );
+       return array_selector($name, $selected_id, $items);
 }
 
 function languages_list_cells($label, $name, $selected_id=null)
@@ -1623,7 +1609,7 @@ function languages_list_cells($label, $name, $selected_id=null)
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       languages_list($name, $selected_id);
+       echo languages_list($name, $selected_id);
        echo "</td>\n";
 }
 
@@ -1638,15 +1624,9 @@ function languages_list_row($label, $name, $selected_id=null)
 
 function bank_account_types_list($name, $selected_id=null)
 {
-       $types = bank_account_types::get_all();
+       global $bank_account_types;
 
-       $items = array();
-       foreach ($types as $type)
-       {
-                       $items[$type['id']] = $type['name'];
-       }
-       
-       return array_selector($name, $selected_id, $items );
+       return array_selector($name, $selected_id, $bank_account_types);
 }
 
 function bank_account_types_list_cells($label, $name, $selected_id=null)
@@ -1654,7 +1634,7 @@ 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";
 }
 
@@ -1668,18 +1648,14 @@ function bank_account_types_list_row($label, $name, $selected_id=null)
 //------------------------------------------------------------------------------------------------
 function payment_person_types_list($name, $selected_id=null, $submit_on_change=false)
 {
-       $types = payment_person_types::get_all();
+       global $payment_person_types;
 
        $items = array();
-       foreach ($types as $type)
+       foreach ($payment_person_types as $key=>$type)
        {
-               if (payment_person_types::has_items($type['id']))
-               {
-                       if ($type['id'] != payment_person_types::WorkOrder())
-                               $items[$type['id']] = $type['name'];
-               }
-       }
-       
+               if ($key != PT_WORKORDER)
+                       $items[$key] = $type;
+       }               
        return array_selector($name, $selected_id, $items, 
                array( 'select_submit'=> $submit_on_change ) );
 }
@@ -1689,39 +1665,32 @@ function payment_person_types_list_cells($label, $name, $selected_id=null, $rela
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = payment_person_types_list($name, $selected_id, $related);
+       echo payment_person_types_list($name, $selected_id, $related);
        echo "</td>\n";
-       return $str;
 }
 
 function payment_person_types_list_row($label, $name, $selected_id=null, $related=null)
 {
        echo "<tr>\n";
-       $str = payment_person_types_list_cells($label, $name, $selected_id, $related);
+       payment_person_types_list_cells($label, $name, $selected_id, $related);
        echo "</tr>\n";
-       return $str;
 }
 
 //------------------------------------------------------------------------------------------------
 
 function wo_types_list($name, $selected_id=null)
 {
-       $types = wo_types::get_all();
-
-       $items = array();
-       foreach ($types as $type)
-               $items[$type['id']] = $type['name'];
+       global $wo_types_array;
        
-       return array_selector($name, $selected_id, $items
+       return array_selector($name, $selected_id, $wo_types_array
                array( 'select_submit'=> true, 'async' => true ) );
 }
 
 function wo_types_list_row($label, $name, $selected_id=null)
 {
        echo "<tr><td>$label</td><td>\n";
-       $str = wo_types_list($name, $selected_id);
+       echo wo_types_list($name, $selected_id);
        echo "</td></tr>\n";
-       return $str;
 }
 
 //------------------------------------------------------------------------------------------------
@@ -1731,7 +1700,7 @@ function dateformats_list_row($label, $name, $value=null)
        global $dateformats;
 
        echo "<tr><td>$label</td>\n<td>";
-       array_selector( $name, $value, $dateformats );
+       echo array_selector( $name, $value, $dateformats );
        echo "</td></tr>\n";
 }
 
@@ -1740,7 +1709,7 @@ function dateseps_list_row($label, $name, $value=null)
        global $dateseps;
 
        echo "<tr><td>$label</td>\n<td>";
-       array_selector( $name, $value, $dateseps );
+       echo array_selector( $name, $value, $dateseps );
        echo "</td></tr>\n";
 }
 
@@ -1749,7 +1718,7 @@ function thoseps_list_row($label, $name, $value=null)
        global $thoseps;
 
        echo "<tr><td>$label</td>\n<td>";
-       array_selector( $name, $value, $thoseps );
+       echo array_selector( $name, $value, $thoseps );
        echo "</td></tr>\n";
 }
 
@@ -1758,7 +1727,7 @@ function decseps_list_row($label, $name, $value=null)
        global $decseps;
 
        echo "<tr><td>$label</td>\n<td>";
-       array_selector( $name, $value, $decseps );
+       echo array_selector( $name, $value, $decseps );
        echo "</td></tr>\n";
 }
 
@@ -1779,7 +1748,7 @@ function themes_list_row($label, $name, $value=null)
        ksort($themes);
 
        echo "<tr><td>$label</td>\n<td>";
-       array_selector( $name, $value, $themes );
+       echo array_selector( $name, $value, $themes );
        echo "</td></tr>\n";
 }
 
@@ -1792,39 +1761,38 @@ function pagesizes_list_row($label, $name, $value=null)
                $items[$pz] = $pz;
 
        echo "<tr><td>$label</td>\n<td>";
-       array_selector( $name, $value, $items );
+       echo array_selector( $name, $value, $items );
        echo "</td></tr>\n";
 }
 
-function security_headings_list_row($label, $name, $value=null)
+function systypes_list($name, $value=null, $spec_opt=false, $submit_on_change=false)
 {
-       global $security_headings;
+       global $systypes_array;
 
-       echo "<tr><td>$label</td>\n<td>";
-       array_selector( $name, $value, $security_headings );
-       echo "</td></tr>\n";
+       return array_selector($name, $value, $systypes_array, 
+               array( 
+                       'spec_option'=> $spec_opt,
+                       'spec_id' => ALL_NUMERIC,
+                       'select_submit'=> $submit_on_change,
+                       'async' => false,
+                       )
+       );
 }
 
 function systypes_list_cells($label, $name, $value=null, $submit_on_change=false)
 {
-       global $systypes_array;
-
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-
-       $items = array();
-       foreach ($systypes_array as $key=>$type)
-                       $items[$key] = $type['name'];
-       
-       $str = array_selector($name, $value, $items, 
-               array( 
-                       'select_submit'=> $submit_on_change,
-                       'async' => false
-                       )
-       );
+       echo systypes_list($name, $value, false, $submit_on_change);
        echo "</td>\n";
-       return $str;
+}
+
+function systypes_list_row($label, $name, $value=null, $submit_on_change=false)
+{
+       echo "<tr>\n";
+       systypes_list_cells($label, $name, $value, false, $submit_on_change);
+       echo "</tr>\n";
 }
 
 function journal_types_list_cells($label, $name, $value=null, $submit_on_change=false)
@@ -1835,13 +1803,14 @@ function journal_types_list_cells($label, $name, $value=null, $submit_on_change=
                echo "<td>$label</td>\n";
        echo "<td>";
 
-       $items = array();
-       foreach ($systypes_array as $key=>$type)
-               // exclude orders and dimensions
-               if (!in_array($key, array(18,26,30,40)))
-                       $items[$key] = $type['name'];
+       $items = $systypes_array;
+
+       // exclude quotes, orders and dimensions
+       foreach (array(ST_PURCHORDER, ST_WORKORDER, ST_SALESORDER, ST_DIMENSION, 
+                               ST_SALESQUOTE) as $excl)
+                       unset($items[$excl]);
        
-       $str = array_selector($name, $value, $items, 
+       echo array_selector($name, $value, $items, 
                array( 
                        'spec_option'=> _("All"),
                        'spec_id' => -1,
@@ -1850,15 +1819,6 @@ function journal_types_list_cells($label, $name, $value=null, $submit_on_change=
                        )
        );
        echo "</td>\n";
-       return $str;
-}
-
-function systypes_list_row($label, $name, $value=null, $submit_on_change=false)
-{
-       echo "<tr>\n";
-       $str = systypes_list_cells($label, $name, $value, $submit_on_change);
-       echo "</tr>\n";
-       return $str;
 }
 
 function cust_allocations_list_cells($label, $name, $selected=null)
@@ -1876,9 +1836,8 @@ function cust_allocations_list_cells($label, $name, $selected=null)
                '4' => _("Credit Notes"),
                '5' => _("Delivery Notes")
        );
-       $str = array_selector($name, $selected, $allocs);
+       echo array_selector($name, $selected, $allocs);
        echo "</td>\n";
-       return $str;
 }
 
 function supp_allocations_list_cell($name, $selected=null)
@@ -1894,9 +1853,8 @@ function supp_allocations_list_cell($name, $selected=null)
                '4' => _("Credit Notes"),
                '5' => _("Overdue Credit Notes")
        );
-       $str = array_selector($name, $selected, $allocs);
+       echo array_selector($name, $selected, $allocs);
        echo "</td>\n";
-       return $str;
 }
 
 function policy_list_cells($label, $name, $selected=null)
@@ -1904,11 +1862,10 @@ function policy_list_cells($label, $name, $selected=null)
        if ($label != null)
                label_cell($label);
        echo "<td>\n";
-       $str = array_selector($name, $selected, 
+       echo array_selector($name, $selected, 
                                array( '' => _("Automatically put balance on back order"),
                                        'CAN' => _("Cancel any quantites not delivered")) );
        echo "</td>\n";
-       return $str;
 }
 
 function policy_list_row($label, $name, $selected=null)
@@ -1923,20 +1880,18 @@ function credit_type_list_cells($label, $name, $selected=null, $submit_on_change
        if ($label != null)
                label_cell($label);
        echo "<td>\n";
-       $str = array_selector($name, $selected, 
+       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";
-       return $str;
 }
 
 function credit_type_list_row($label, $name, $selected=null, $submit_on_change=false)
 {
        echo "<tr>\n";
-       $str = credit_type_list_cells($label, $name, $selected, $submit_on_change);
+       credit_type_list_cells($label, $name, $selected, $submit_on_change);
        echo "</tr>\n";
-       return $str;
 }
 
 function number_list($name, $selected, $from, $to, $no_option=false)
@@ -1947,7 +1902,7 @@ function number_list($name, $selected, $from, $to, $no_option=false)
 
        return array_selector($name, $selected, $items,
                                array(  'spec_option' => $no_option,
-                                               'spec_id' => reserved_words::get_all_numeric()) );
+                                               'spec_id' => ALL_NUMERIC) );
 }
 
 function number_list_cells($label, $name, $selected, $from, $to, $no_option=false)
@@ -1955,14 +1910,14 @@ function number_list_cells($label, $name, $selected, $from, $to, $no_option=fals
        if ($label != null)
                label_cell($label);
        echo "<td>\n";
-       number_list($name, $selected, $from, $to, $no_option);
+       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>\n";
-       number_list_cells($label, $name, $selected, $from, $to, $no_option);
+       echo number_list_cells($label, $name, $selected, $from, $to, $no_option);
        echo "</tr>\n";
 }
 
@@ -1982,7 +1937,7 @@ function print_profiles_list_row($label, $name, $selected_id=null, $spec_opt=fal
                echo "<td>$label</td>\n";
        echo "<td>";
 
-       array_selector($name, $selected_id, $profiles, 
+       echo array_selector($name, $selected_id, $profiles, 
                array( 'select_submit'=> $submit_on_change,
                        'spec_option'=>$spec_opt,
                        'spec_id' => ''
@@ -2003,7 +1958,7 @@ function printers_list($name, $selected_id=null, $spec_opt=false, $submit_on_cha
                        $printers[$myrow['id']] = $myrow['name'].'&nbsp;-&nbsp;'.$myrow['description'];
                }
        }
-       array_selector($name, $selected_id, $printers, 
+       return array_selector($name, $selected_id, $printers, 
                array( 'select_submit'=> $submit_on_change,
                        'spec_option'=>$spec_opt,
                        'spec_id' => ''
@@ -2019,7 +1974,7 @@ function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_cha
        if ($type != null)
                $sql .= " WHERE type=$type";
 
-       combo_input($name, $selected_id, $sql, 'id', 'description',
+       return combo_input($name, $selected_id, $sql, 'id', 'description',
                array(
                        'spec_id' => '',
                        'order' => 'description',
@@ -2032,7 +1987,7 @@ function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_cha
 function quick_entries_list_cells($label, $name, $selected_id=null, $type, $submit_on_change=false)
 {
        echo "<td>$label</td><td>\n";
-       quick_entries_list($name, $selected_id, $type, $submit_on_change);
+       echo quick_entries_list($name, $selected_id, $type, $submit_on_change);
        echo "</td>";
 }
 
@@ -2049,7 +2004,7 @@ function quick_actions_list_row($label, $name, $selected_id=null, $submit_on_cha
        global $quick_actions;
        
        echo "<tr><td>$label</td><td>";
-       array_selector($name, $selected_id, $quick_actions, 
+       echo array_selector($name, $selected_id, $quick_actions, 
                array( 
                        'select_submit'=> $submit_on_change
                ) );
@@ -2061,7 +2016,7 @@ function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on
        global $quick_entry_types;
                
        echo "<tr><td>$label</td><td>";
-       array_selector($name, $selected_id, $quick_entry_types, 
+       echo array_selector($name, $selected_id, $quick_entry_types, 
                array( 
                        'select_submit'=> $submit_on_change
                        ) );
@@ -2077,12 +2032,128 @@ function class_types_list_row($label, $name, $selected_id=null, $submit_on_chang
        global $class_types;
        
        echo "<tr><td>$label</td><td>";
-       array_selector($name, $selected_id, $class_types, 
+       echo array_selector($name, $selected_id, $class_types, 
                array( 
                        'select_submit'=> $submit_on_change
                ) );
        echo "</td></tr>\n";
 }
 
+//------------------------------------------------------------------------------------------------
+
+function security_roles_list($name, $selected_id=null, $new_item=false, $submit_on_change=false,
+       $show_inactive = false)
+{
+       global $all_items;
+
+       $sql = "SELECT id, role, inactive FROM ".TB_PREF."security_roles";
+
+return combo_input($name, $selected_id, $sql, 'id', 'description',
+       array(
+               'spec_option'=>$new_item ? _("New role") : false,
+               'spec_id' => '',
+               'select_submit'=> $submit_on_change,
+               'show_inactive' => $show_inactive
+       ) );
+}
+
+function security_roles_list_cells($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false,
+       $show_inactive = false)
+{
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+       echo security_roles_list($name, $selected_id, $new_item, $submit_on_change, $show_inactive);
+       echo "</td>\n";
+}
+
+function security_roles_list_row($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false,
+       $show_inactive = false)
+{
+       echo "<tr>";
+       security_roles_list_cells($label, $name, $selected_id, $new_item, $submit_on_change, $show_inactive);
+       echo "</tr>\n";
+}
+
+function tab_list_row($label, $name, $selected_id=null, $all = false)
+{
+       global $installed_extensions;
+       
+       $tabs = array();
+       foreach ($_SESSION['App']->applications as $app) {
+               $tabs[$app->id] = access_string($app->name, true);
+       }
+       if ($all) {     // add also not active ext. modules
+               foreach ($installed_extensions as $ext) {
+                       if ($ext['type'] == 'module' && !$ext['active'])
+                               $tabs[$ext['tab']] = access_string($ext['title'], true);
+               }
+       }
+       echo "<tr>\n";
+       echo "<td>$label</td><td>\n";
+       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)
+               echo "<td>$label</td>\n";
+       echo "<td>\n";
+       echo tag_list($name, $height, $type, $mult, $all, $spec_opt);
+       echo "</td>\n";
+       
+}
+
+function tag_list_row($label, $name, $height, $type, $mult=false, $all=false, $spec_opt = false)
+{
+       echo "<tr>\n";
+       tag_list_cells($label, $name, $height, $type, $mult, $all, $spec_opt);
+       echo "</tr>\n"; 
+}
+
+//---------------------------------------------------------------------------------------------
+//     List of sets of active extensions 
+//
+function extset_list($name, $value=null, $submit_on_change=false)
+{
+       global $db_connections;
+
+       $items = array();
+       foreach ($db_connections as $comp)
+               $items[] = sprintf(_("Activated for '%s'"), $comp['name']);
+       return array_selector( $name, $value, $items,
+               array(
+                       'spec_option'=> _("Installed on system"),
+                       'spec_id' => -1,
+                       'select_submit'=> $submit_on_change,
+                       'async' => true
+               ));
+}
 
 ?>
\ No newline at end of file