HTML cleanup in fiscal years selector helper.
[fa-stable.git] / includes / ui / ui_lists.inc
index a0f82fcf06674ecd18dd758443c0beeb19e85b3e..2cc16888e5fdbd15a94e587fccbadc0ca1691843 100644 (file)
@@ -46,9 +46,10 @@ $opts = array(               // default options
        'sel_hint' => null,
        'search_box' => false,  // name or true/false
        'type' => 0,    // type of extended selector:
-               // 0 - with (optional) visible search box, search by id
+               // 0 - with (optional) visible search box, search by fragment inside id
                // 1 - with hidden search box, search by option text
-               // 2 - TODO reverse: box with hidden selector available via enter; this
+               // 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
@@ -60,7 +61,8 @@ $opts = array(                // default 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. 
+       'show_inactive' => false, // show inactive records. 
+       'editable' => false // false, or length of editable entry field
 );
 // ------ merge options with defaults ----------
        if($options != null)
@@ -68,12 +70,25 @@ $opts = array(              // default 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'];
-       $by_id = ($opts['type'] == 0);
-       $class = $by_id ? 'combo':'combo2';
+       if ($opts['type'] == 0) {
+               $by_id = true;
+               $class = 'combo';
+       } elseif($opts['type'] == 1) {
+               $by_id = false;
+               $class = 'combo2';
+       } else {
+               $by_id = true;
+               $class = 'combo3';
+       }
+
        $disabled = $opts['disabled'] ? "disabled" : '';
        $multi = $opts['multi'];
        
@@ -90,16 +105,15 @@ $opts = array(             // default options
                        : _('Enter description fragment to search or * for all')) :'';
 
        if ($selected_id == null) {
-               $selected_id = get_post($name, $opts['default']);
+               $selected_id = get_post($name, (string)$opts['default']);
        }
        if(!is_array($selected_id))
-               $selected_id = array($selected_id); // code is generalized for multiple selection support
+               $selected_id = array((string)$selected_id); // code is generalized for multiple selection support
 
        $txt = get_post($search_box);
        $rel = '';
        $limit = '';
-
-       if (isset($_POST['_'.$name.'_update'])) {
+       if (isset($_POST['_'.$name.'_update'])) { // select list or search box change
                if ($by_id) $txt = $_POST[$name];
 
                if (!$opts['async'])
@@ -107,33 +121,41 @@ $opts = array(            // default options
                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_submit])) {
-               $selected_id = array(); // ignore selected_id while search
+       if (isset($_POST[$search_button])) {
                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 . "='". get_post($name, $spec_id)."'";
-       }
-       else
-               if ($txt != '*') {
+       if ($search_box) {
+               // search related sql modifications
 
-               foreach($opts['search'] as $i=> $s)
-                       $opts['search'][$i] = $s . " LIKE '%{$txt}%'";
-               $opts['where'][] = '('. implode($opts['search'], ' OR ') . ')';
+               $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 ') . ')';
+                               }
                }
        }
-   }
+
        // sql completion
        if (count($opts['where'])) {
                $where = strpos($sql, 'WHERE')==false ? ' WHERE ':' AND ';
@@ -158,19 +180,27 @@ $opts = array(            // default options
        $first_id = false;
        $found = false;
        $lastcat = null;
-//if($name=='stock_id') display_error($sql);
+       $edit = false;
+//if($name=='stock_id')        display_notification('<pre>'.print_r($_POST, true).'</pre>');
+//if($name=='curr_default') display_notification($opts['search_submit']);
        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);
                        $sel = '';
-                       if (get_post($search_submit) && ($txt === $value)) {
+                       if (get_post($search_button) && ($txt == $value)) {
                                $selected_id[] = $value;
                        }
-                       if (in_array($value, $selected_id)) {
+
+                       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==='') {
@@ -184,11 +214,15 @@ $opts = array(            // default options
                        }
                        $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);
        }
 
@@ -207,24 +241,35 @@ $opts = array(            // default options
        if ($found===false) {
                $selected_id = array($first_id);
        }
+       
        $_POST[$name] = $multi ? $selected_id : $selected_id[0];
 
-       if ($by_id && $search_box != false) {
-               $txt = $found;
-               $Ajax->addUpdate($name, $search_box, $txt ? $txt : '');
-       }
-       $selector = "<select ".($multi ? "multiple" : '')
+       $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 : '');
+       }
+
        $Ajax->addUpdate($name, "_{$name}_sel", $selector);
 
-       // because of bug which M$ cannot fix since IE 5.0
-       // we must embed whole selector in span tags to enable proper ajax update
+       // span for select list/input field update
        $selector = "<span id='_{$name}_sel'>".$selector."</span>\n";
 
-       if ($select_submit != false) { // if submit on change is used - add select button
+        // if selectable or editable list is used - add select button
+       if ($select_submit != false || $search_button) {
                global $_select_button;
        // button class selects form reload/ajax selector update
                $selector .= sprintf($_select_button, $disabled, user_theme(),
@@ -232,7 +277,6 @@ $opts = array(              // default options
                         '_'.$name.'_update')."\n";
        }
 // ------ make combo ----------
-
        $edit_entry = '';
        if ($search_box != false) {
                $edit_entry = "<input $disabled type='text' name='$search_box' id='$search_box' size='".
@@ -241,11 +285,11 @@ $opts = array(            // default options
                        .$opts['box_hint']."'"
                        .(!fallback_mode() && !$by_id ? " style=display:none;":'')
                        .">\n";
-               if ($search_submit != false) {
+               if ($search_submit != false || $opts['editable']) {
                        global $_search_button;
                        $edit_entry .= sprintf($_search_button, $disabled, user_theme(),
                                (fallback_mode() ? '' : 'display:none;'),
-                               $search_submit)."\n";
+                               $search_submit ? $search_submit : "_{$name}_button")."\n";
                }
        }
        default_focus(($search_box && $by_id) ? $search_box : $name);
@@ -299,7 +343,7 @@ $opts = array(              // default options
                $selected_id = get_post($name, $opts['default']);
        }
        if(!is_array($selected_id))
-               $selected_id = array($selected_id); // code is generalized for multiple selection support
+               $selected_id = array((string)$selected_id); // code is generalized for multiple selection support
 
        if (isset($_POST[ '_'.$name.'_update'])) {
                if (!$opts['async'])
@@ -315,7 +359,7 @@ $opts = array(              // default options
 //if($name=='SelectStockFromList') display_error($sql);
                foreach($items as $value=>$descr) {
                        $sel = '';
-                       if (in_array((string)$value, $selected_id)) {
+                       if (in_array((string)$value, $selected_id, true)) {
                                $sel = 'selected';
                                $found = $value;
                        }
@@ -326,6 +370,9 @@ $opts = array(              // default options
                        $selector .= "<option $sel value='$value'>$descr</option>\n";
                }
 
+       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;
@@ -339,7 +386,8 @@ $opts = array(              // default options
                $selected_id = array($first_id);
        }
        $_POST[$name] = $multi ? $selected_id : $selected_id[0];
-       $selector = "<select ".($multi  ? "multiple" : '')
+
+       $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";
@@ -372,6 +420,21 @@ function _format_add_curr($row)
                '' : ("&nbsp;-&nbsp;" . $row[2]));
 }
 
+function add_edit_combo($type)
+{
+       global $path_to_root, $popup_editors, $use_icon_for_editkey;
+
+       if (!isset($use_icon_for_editkey) || $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>"; 
+}
+
 function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
        $all=false, $editkey = false)
 {
@@ -384,12 +447,13 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
        if ($editkey)
                set_editor('supplier', $name, $editkey);
                
-       return combo_input($name, $selected_id, $sql, 'supplier_id', 'supp_name',
+       $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_items,
                'select_submit'=> $submit_on_change,
@@ -398,6 +462,9 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
                _('Select supplier'),
                'show_inactive'=>$all
                ));
+       if ($editkey)
+               $ret .= add_edit_combo('supplier');             
+       return $ret;
 }
 
 function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, 
@@ -432,13 +499,14 @@ function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_
        if ($editkey)
                set_editor('customer', $name, $editkey);
 
-       return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
+       $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_items,
                'select_submit'=> $submit_on_change,
@@ -447,6 +515,9 @@ function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_
                _('Select customer'),
                'show_inactive' => $show_inactive
        ) );
+       if ($editkey)
+               $ret .= add_edit_combo('customer');
+       return $ret;
 }
 
 function customer_list_cells($label, $name, $selected_id=null, $all_option=false, 
@@ -463,6 +534,8 @@ function customer_list_cells($label, $name, $selected_id=null, $all_option=false
 function customer_list_row($label, $name, $selected_id=null, $all_option = false, 
        $submit_on_change=false, $show_inactive=false, $editkey = false)
 {
+       global $path_to_root;
+
        echo "<tr><td class='label'>$label</td><td nowrap>";
        echo customer_list($name, $selected_id, $all_option, $submit_on_change,
                $show_inactive, $editkey);
@@ -477,13 +550,13 @@ function customer_branches_list($customer_id, $name, $selected_id=null,
        global $all_items;
 
        $sql = "SELECT branch_code, branch_ref FROM ".TB_PREF."cust_branch
-               WHERE debtor_no='" . $customer_id . "' ";
+               WHERE debtor_no=" . db_escape($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',
+       $ret = combo_input($name, $selected_id, $sql, 'branch_code', 'branch_ref',
        array(
                'where' => $where,
                'order' => array('branch_ref'),
@@ -492,6 +565,11 @@ function customer_branches_list($customer_id, $name, $selected_id=null,
                'select_submit'=> $submit_on_change,
                'sel_hint' => _('Select customer branch')
        ) );
+       if ($editkey)
+       {
+               $ret .= add_edit_combo('branch');
+       }       
+       return $ret;
 }
 //------------------------------------------------------------------------------------------------
 
@@ -554,7 +632,6 @@ function currencies_list($name, $selected_id=null, $submit_on_change=false)
        $sql = "SELECT curr_abrev, currency, inactive FROM ".TB_PREF."currencies";
 
 // default to the company currency
-
 return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency',
        array(
                'select_submit'=> $submit_on_change,
@@ -601,7 +678,7 @@ return combo_input($name, $selected_id, $sql, 'id', '',
 function _format_fiscalyears($row)
 {
        return sql2date($row[1]) . "&nbsp;-&nbsp;" . sql2date($row[2])
-       . "&nbsp;&nbsp;" . ($row[3] ? _('Closed') : _('Active')) . "</option>\n";
+       . "&nbsp;&nbsp;" . ($row[3] ? _('Closed') : _('Active'));
 }
 
 function fiscalyears_list_cells($label, $name, $selected_id=null)
@@ -637,7 +714,7 @@ $options = array(
        if (!$showclosed)
                $options['where'][] = "closed=0";
        if($showtype)
-               $options['where'][] = "type_=$showtype";
+               $options['where'][] = "type_=".db_escape($showtype);
 
        return combo_input($name, $selected_id, $sql, 'id', 'ref', $options);
 }
@@ -668,13 +745,13 @@ function stock_items_list($name, $selected_id=null, $all_option=false,
 {
        global $all_items;
 
-       $sql = "SELECT stock_id, s.description, c.description, s.inactive
+       $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";
 
        if ($editkey)
                set_editor('item', $name, $editkey);
 
-       return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
+       $ret = combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
        array_merge(
          array(
                'format' => '_format_stock_items',
@@ -688,6 +765,10 @@ function stock_items_list($name, $selected_id=null, $all_option=false,
                'category' => 2,
                'order' => array('c.description','stock_id')
          ), $opts) );
+       if ($editkey)
+               $ret .= add_edit_combo('item');         
+       return $ret;
+         
 }
 
 function _format_stock_items($row)
@@ -721,7 +802,7 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
        global $all_items;
        // all sales codes
        $sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit,
-                        i.inactive
+                        i.inactive, if(count(*)>1, '0', s.editable) as editable
                        FROM
                        ".TB_PREF."stock_master s,
                        ".TB_PREF."item_codes i
@@ -751,12 +832,17 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
                'size'=>15,
                'select_submit'=> $submit_on_change,
                'category' => 2,
-               'order' => array('c.description','i.item_code')
+               'order' => array('c.description','i.item_code'),
+               'editable' => 30,
+               'max' => 255
          ), $opts) );
 }
 
-function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+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,
@@ -766,7 +852,7 @@ function sales_items_list_cells($label, $name, $selected_id=null, $all_option=fa
 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));
+               'kits', array('cells'=>false, 'editable' => false));
 }
 
 function sales_local_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
@@ -776,7 +862,7 @@ function sales_local_items_list_row($label, $name, $selected_id=null, $all_optio
                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));
+               'local', array('cells'=>false, 'editable' => false));
        echo "</td></tr>";
 }
 //------------------------------------------------------------------------------------
@@ -811,7 +897,7 @@ function stock_component_items_list($name, $parent_stock_id, $selected_id=null,
        $all_option=false, $submit_on_change=false, $editkey = false)
 {
        return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("stock_id != '$parent_stock_id'")), $editkey);
+               array('where'=>array("stock_id != ".db_escape($parent_stock_id))), $editkey);
 }
 
 function stock_component_items_list_cells($label, $name, $parent_stock_id, 
@@ -820,7 +906,7 @@ function stock_component_items_list_cells($label, $name, $parent_stock_id,
        if ($label != null)
                echo "<td>$label</td>\n";
        echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true),
+               array('where'=>array("stock_id != ".db_escape($parent_stock_id)), 'cells'=>true),
                $editkey);
 }
 //------------------------------------------------------------------------------------
@@ -849,7 +935,9 @@ function stock_purchasable_items_list($name, $selected_id=null,
                array('where'=>array("mb_flag!= 'M'"), 
                        'show_inactive'=>$all), $editkey);
 }
-
+//
+//     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)
 {
@@ -857,9 +945,10 @@ function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
                echo "<td>$label</td>\n";
        echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
                array('where'=>array("mb_flag!= 'M'"), 
+                        'editable' => 30,
                         'cells'=>true), $editkey);
 }
-
+/*
 function stock_purchasable_items_list_row($label, $name, $selected_id=null,
                        $all_option=false, $submit_on_change=false, $editkey=false)
 {
@@ -868,7 +957,7 @@ function stock_purchasable_items_list_row($label, $name, $selected_id=null,
                $all_option, $submit_on_change, $editkey);
        echo "</tr>\n";
 }
-
+*/
 //------------------------------------------------------------------------------------
 
 function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=true)
@@ -1328,7 +1417,7 @@ function workcenter_list_row($label, $name, $selected_id=null, $all_option=false
 
 //-----------------------------------------------------------------------------------------------
 
-function bank_accounts_list($name, $selected_id=null, $submit_on_change=false)
+function bank_accounts_list($name, $selected_id=null, $submit_on_change=false, $spec_option=false)
 {
        $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive
                FROM ".TB_PREF."bank_accounts";
@@ -1337,6 +1426,8 @@ function bank_accounts_list($name, $selected_id=null, $submit_on_change=false)
        array(
                'format' => '_format_add_curr',
                'select_submit'=> $submit_on_change,
+               'spec_option' => $spec_option,
+               'spec_id' => '',
                'async' => false
        ) );
 }
@@ -1362,7 +1453,7 @@ function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha
 {
        $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive
                FROM ".TB_PREF."bank_accounts
-               WHERE ".TB_PREF."bank_accounts.account_type=3";
+               WHERE ".TB_PREF."bank_accounts.account_type=".BT_CASH;
 
        if ($label != null)
                echo "<tr><td class='label'>$label</td>\n";
@@ -1399,13 +1490,33 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub
 
 }
 //-----------------------------------------------------------------------------------------------
+// Payment type selector for current user.
+//
+function sale_payment_list($name, $category, $selected_id=null, $submit_on_change=true)
+{
+       $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
+       
+       if ($category == PM_CASH) // only cash
+                       $sql .= " WHERE days_before_due=0 AND day_in_following_month=0";
+       if ($category == PM_CREDIT) // only delayed payments
+                       $sql .= " WHERE days_before_due!=0 OR day_in_following_month!=0";
 
-function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
+       return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms',
+       array(
+               'select_submit'=> $submit_on_change,
+               'async' => true
+       ) );
+
+}
+
+function sale_payment_list_cells($label, $name, $category, $selected_id=null, $submit_on_change=true)
 {
        if ($label != null)
                echo "<td class='label'>$label</td>\n";
        echo "<td>";
-       echo yesno_list($name, $selected_id, _('Cash'), _('Delayed'), $submit_on_change);
+
+       echo sale_payment_list($name, $category, $selected_id, $submit_on_change);
+
        echo "</td>\n";
 }
 //-----------------------------------------------------------------------------------------------
@@ -1469,7 +1580,7 @@ function stock_categories_list_row($label, $name, $selected_id=null, $spec_opt=f
 
 //-----------------------------------------------------------------------------------------------
 
-function gl_account_types_list($name, $selected_id=null, $all_option=false, $all_option_numeric=true)
+function gl_account_types_list($name, $selected_id=null, $all_option=false, $all=true)
 {
        global $all_items;
 
@@ -1477,28 +1588,27 @@ function gl_account_types_list($name, $selected_id=null, $all_option=false, $all
 
        return combo_input($name, $selected_id, $sql, 'id', 'name',
        array(
-               'order' => 'id',
+               'format' => '_format_account',
+               'order' => array('class_id', 'id', 'parent'),
                'spec_option' =>$all_option,
-               'spec_id' => $all_option_numeric ? 0 : $all_items
+               'spec_id' => $all_items
        ) );
 }
 
-function gl_account_types_list_cells($label, $name, $selected_id=null, $all_option=false,
-       $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>";
-       echo gl_account_types_list($name, $selected_id, $all_option, $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=null, $all_option=false,
-       $all_option_numeric=false)
+function gl_account_types_list_row($label, $name, $selected_id=null, $all_option=false,        $all=false)
 {
        echo "<tr><td class='label'>$label</td>";
        gl_account_types_list_cells(null, $name, $selected_id, $all_option,
-               $all_option_numeric);
+               $all);
        echo "</tr>\n";
 }
 
@@ -1523,7 +1633,8 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
                'format' => '_format_account',
                'spec_option' => $all_option===true ?  _("Use Item Sales Accounts") : $all_option,
                'spec_id' => '',
-               'order' => array('type.id','account_code'),
+               'type' => 2,
+               'order' => array('type.class_id','type.id','account_code'),
                'search_box' => $cells,
                        'search_submit' => false,
                        'size' => 12,
@@ -1593,30 +1704,31 @@ function yesno_list_row($label, $name, $selected_id=null, $name_yes="", $name_no
 
 //------------------------------------------------------------------------------------------------
 
-function languages_list($name, $selected_id=null)
+function languages_list($name, $selected_id=null, $all_option=false)
 {
        global $installed_languages;
 
        $items = array();
+       if ($all_option)
+               $items[''] = $all_option;
        foreach ($installed_languages as $lang)
                        $items[$lang['code']] = $lang['name'];
-       
        return array_selector($name, $selected_id, $items);
 }
 
-function languages_list_cells($label, $name, $selected_id=null)
+function languages_list_cells($label, $name, $selected_id=null, $all_option=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       echo languages_list($name, $selected_id);
+       echo languages_list($name, $selected_id, $all_option);
        echo "</td>\n";
 }
 
-function languages_list_row($label, $name, $selected_id=null)
+function languages_list_row($label, $name, $selected_id=null, $all_option=false)
 {
        echo "<tr><td class='label'>$label</td>";
-       languages_list_cells(null, $name, $selected_id);
+       languages_list_cells(null, $name, $selected_id, $all_option);
        echo "</tr>\n";
 }
 
@@ -1765,11 +1877,13 @@ function pagesizes_list_row($label, $name, $value=null)
        echo "</td></tr>\n";
 }
 
-function systypes_list($name, $value=null, $spec_opt=false, $submit_on_change=false)
+function systypes_list($name, $value=null, $spec_opt=false, $submit_on_change=false, $exclude=array())
 {
        global $systypes_array;
 
-       return array_selector($name, $value, $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,
@@ -1779,19 +1893,19 @@ function systypes_list($name, $value=null, $spec_opt=false, $submit_on_change=fa
        );
 }
 
-function systypes_list_cells($label, $name, $value=null, $submit_on_change=false)
+function systypes_list_cells($label, $name, $value=null, $submit_on_change=false, $exclude=array())
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       echo systypes_list($name, $value, false, $submit_on_change);
+       echo systypes_list($name, $value, false, $submit_on_change, $exclude);
        echo "</td>\n";
 }
 
-function systypes_list_row($label, $name, $value=null, $submit_on_change=false)
+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);
+       systypes_list_cells(null, $name, $value, $submit_on_change, $exclude);
        echo "</tr>\n";
 }
 
@@ -1806,8 +1920,7 @@ function journal_types_list_cells($label, $name, $value=null, $submit_on_change=
        $items = $systypes_array;
 
        // exclude quotes, orders and dimensions
-       foreach (array(ST_PURCHORDER, ST_WORKORDER, ST_SALESORDER, ST_DIMENSION, 
-                               ST_SALESQUOTE) as $excl)
+       foreach (array(ST_PURCHORDER, ST_SALESORDER, ST_DIMENSION, ST_SALESQUOTE, ST_LOCTRANSFER) as $excl)
                        unset($items[$excl]);
        
        echo array_selector($name, $value, $items, 
@@ -1857,6 +1970,25 @@ function supp_allocations_list_cell($name, $selected=null)
        echo "</td>\n";
 }
 
+function supp_transactions_list_cell($name, $selected=null)
+{
+       global $all_items;
+
+       echo "<td>\n";
+       $allocs = array( 
+               $all_items=>_("All Types"),
+               '6'=>_("GRNs"),
+               '1'=> _("Invoices"),
+               '2'=> _("Overdue Invoices"),
+               '3' => _("Payments"),
+               '4' => _("Credit Notes"),
+               '5' => _("Overdue Credit Notes")
+       );
+
+       echo array_selector($name, $selected, $allocs);
+       echo "</td>\n";
+}
+
 function policy_list_cells($label, $name, $selected=null)
 {
        if ($label != null)
@@ -2077,7 +2209,7 @@ function security_roles_list_row($label, $name, $selected_id=null, $new_item=fal
        echo "</tr>\n";
 }
 
-function tab_list_row($label, $name, $selected_id=null, $all = false)
+function tab_list_row($label, $name, $selected_id=null)
 {
        global $installed_extensions;
        
@@ -2085,12 +2217,6 @@ function tab_list_row($label, $name, $selected_id=null, $all = false)
        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 class='label'>$label</td><td>\n";
        echo array_selector($name, $selected_id, $tabs);
@@ -2151,11 +2277,102 @@ function extset_list($name, $value=null, $submit_on_change=false)
                $items[] = sprintf(_("Activated for '%s'"), $comp['name']);
        return array_selector( $name, $value, $items,
                array(
-                       'spec_option'=> _("Installed on system"),
+                       'spec_option'=> _("Available and/or installed"),
                        'spec_id' => -1,
                        'select_submit'=> $submit_on_change,
                        'async' => true
                ));
 }
 
-?>
\ No newline at end of file
+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;
+       }
+
+       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] == '_'))
+               {
+                       $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;
+               }
+       }
+       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 = array_combine(array_keys($payment_services), array_keys($payment_services));
+
+       return array_selector($name, null, $services, array(
+                       'spec_option'=> _("No payment Link"),
+                       'spec_id' => '',
+               ));
+}
+
+?>