Removed obsolete Movement Types handling.
[fa-stable.git] / includes / ui / ui_lists.inc
index ca241361091c984b52ba9aab86e01998a43e4fea..6170e79f41496303cda59347fc4fd520a38bb721 100644 (file)
@@ -13,13 +13,11 @@ include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/includes/types.inc");
 include_once($path_to_root . "/includes/current_user.inc");
 
-$_search_button = "<input %s type='submit' class='combo_submit' style='border:0;background:url($path_to_root/themes/"
-       ."%s/images/locate.png) no-repeat;%s' aspect='fallback' name='%s' value=' ' title='"._("Set filter")."'> ";
+define('SEARCH_BUTTON', "<input %s type='submit' class='combo_submit' style='border:0;background:url($path_to_root/themes/"
+       ."%s/images/locate.png) no-repeat;%s' aspect='fallback' name='%s' value=' ' title='"._("Set filter")."'> ");
 
-$_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 = ALL_TEXT;
+define('SELECT_BUTTON', "<input %s type='submit' class='combo_select' style='border:0;background:url($path_to_root/themes/"
+       ."%s/images/button_ok.png) no-repeat;%s' aspect='fallback' name='%s' value=' ' title='"._("Select")."'> ");
 
 //----------------------------------------------------------------------------
 //     Universal sql combo generator
@@ -46,9 +44,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
@@ -77,8 +76,17 @@ $opts = array(               // default options
        $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'];
        
@@ -89,21 +97,20 @@ $opts = array(              // default options
                $opts['sel_hint'] = $by_id || $search_box==false ?
                        '' : _('Press Space tab for search pattern entry');
 
-       if ($opts['box_hint'] === null)  // dodaƦ hint dla pustego ****
+       if ($opts['box_hint'] === null)
                $opts['box_hint'] = $search_box && $search_submit != false ?
                        ($by_id ? _('Enter code fragment to search or * for all')
                        : _('Enter description fragment to search or * for all')) :'';
 
        if ($selected_id == null) {
-               $selected_id = get_post($name, $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'])) { // select list or search box change
                if ($by_id) $txt = $_POST[$name];
 
@@ -134,17 +141,19 @@ $opts = array(            // default options
                                if ($spec_option === false && $selected_id == array())
                                        $limit = ' LIMIT 1';
                                else
-                                       $opts['where'][] = $valfield . "='". get_post($name, $spec_id)."'";
+                                       $opts['where'][] = $valfield . "=". db_escape(get_post($name, $spec_id));
                        }
                        else
                                if ($txt != '*') {
 
                                        foreach($opts['search'] as $i=> $s)
-                                               $opts['search'][$i] = $s . " LIKE '%{$txt}%'";
+                                               $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 ';
@@ -181,7 +190,8 @@ $opts = array(              // default options
                        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'] 
@@ -202,11 +212,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);
        }
 
@@ -254,9 +268,8 @@ $opts = array(              // default options
 
         // 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(),
+               $selector .= sprintf(SELECT_BUTTON, $disabled, user_theme(),
                        (fallback_mode() ? '' : 'display:none;'),
                         '_'.$name.'_update')."\n";
        }
@@ -270,8 +283,7 @@ $opts = array(              // default options
                        .(!fallback_mode() && !$by_id ? " style=display:none;":'')
                        .">\n";
                if ($search_submit != false || $opts['editable']) {
-                       global $_search_button;
-                       $edit_entry .= sprintf($_search_button, $disabled, user_theme(),
+                       $edit_entry .= sprintf(SEARCH_BUTTON, $disabled, user_theme(),
                                (fallback_mode() ? '' : 'display:none;'),
                                $search_submit ? $search_submit : "_{$name}_button")."\n";
                }
@@ -327,7 +339,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'])
@@ -343,28 +355,25 @@ $opts = array(            // default options
 //if($name=='SelectStockFromList') display_error($sql);
                foreach($items as $value=>$descr) {
                        $sel = '';
-                       if (in_array((string)$value, $selected_id)) {
-                               $sel = "selected='selected'";
+                       if (in_array((string)$value, $selected_id, true)) {
+                               $sel = 'selected';
                                $found = $value;
                        }
                        if ($first_id === false) {
                                $first_id = $value;
-                               $first_opt = "<option %s value='$value'>$descr</option>\n";
-                       } 
-                       else {
-                               $selector .= "<option $sel value='$value'>$descr</option>\n";
+                               $first_opt = $descr;
                        }
+                       $selector .= "<option $sel value='$value'>$descr</option>\n";
                }
 
        if ($first_id!==false) {
                $sel = ($found===$first_id) || ($found===false && ($spec_option===false)) ? "selected='selected'" : '';
-               $selector = sprintf($first_opt, $sel).$selector;
        }
        // Prepend special option.
        if ($spec_option !== false) { // if special option used - add it
                $first_id = $spec_id;
                $first_opt = $spec_option;
-               $sel = $found===false ? "selected='selected'" : '';
+               $sel = $found===false ? 'selected' : '';
                $selector = "<option $sel value='$spec_id'>$spec_option</option>\n"
                        . $selector;
        }
@@ -373,6 +382,7 @@ $opts = array(              // default options
                $selected_id = array($first_id);
        }
        $_POST[$name] = $multi ? $selected_id : $selected_id[0];
+
        $selector = "<select autocomplete='off' ".($multi  ? "multiple" : '')
                . ($opts['height']!==false ? ' size="'.$opts['height'].'"' : '')
                . "$disabled name='$name".($multi ? '[]' : '')."' class='combo' title='"
@@ -383,8 +393,7 @@ $opts = array(              // default options
        $selector = "<span id='_{$name}_sel'>".$selector."</span>\n";
 
        if ($select_submit != false) { // if submit on change is used - add select button
-               global $_select_button;
-               $selector .= sprintf($_select_button, $disabled, user_theme(),
+               $selector .= sprintf(SELECT_BUTTON, $disabled, user_theme(),
                        (fallback_mode() ? '' : 'display:none;'),
                         '_'.$name.'_update')."\n";
        }
@@ -406,10 +415,24 @@ function _format_add_curr($row)
                '' : ("&nbsp;-&nbsp;" . $row[2]));
 }
 
+function add_edit_combo($type)
+{
+       global $path_to_root, $popup_editors, $SysPrefs;
+
+       if (!isset($SysPrefs->use_icon_for_editkey) || $SysPrefs->use_icon_for_editkey==0)
+               return "";
+       // Derive theme path
+       $theme_path = $path_to_root . '/themes/' . user_theme();
+
+       $key = $popup_editors[$type][1];
+       $onclick = "onclick=\"javascript:callEditor($key); return false;\"";
+       $img = "<img width='12' height='12' border='0' alt='Add/Edit' title='Add/Edit' src='$theme_path/images/".ICON_EDIT."'>";
+       return "<a target = '_blank' href='#' $onclick tabindex='-1'>$img</a>"; 
+}
+
 function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
        $all=false, $editkey = false)
 {
-       global $all_items;
 
        $sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers ";
 
@@ -417,21 +440,25 @@ 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,
+               'spec_id' => ALL_TEXT,
                'select_submit'=> $submit_on_change,
                'async' => false,
                'sel_hint' => $mode ? _('Press Space tab to filter by name fragment') :
                _('Select supplier'),
                'show_inactive'=>$all
                ));
+       if ($editkey)
+               $ret .= add_edit_combo('supplier');             
+       return $ret;
 }
 
 function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, 
@@ -457,7 +484,6 @@ function supplier_list_row($label, $name, $selected_id=null, $all_option = 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, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master ";
 
@@ -466,21 +492,25 @@ 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,
+               'spec_id' => ALL_TEXT,
                'select_submit'=> $submit_on_change,
                'async' => false,
                'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F2 - entry new customer') :
                _('Select customer'),
                'show_inactive' => $show_inactive
        ) );
+       if ($editkey)
+               $ret .= add_edit_combo('customer');
+       return $ret;
 }
 
 function customer_list_cells($label, $name, $selected_id=null, $all_option=false, 
@@ -497,6 +527,7 @@ 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)
 {
+
        echo "<tr><td class='label'>$label</td><td nowrap>";
        echo customer_list($name, $selected_id, $all_option, $submit_on_change,
                $show_inactive, $editkey);
@@ -508,24 +539,28 @@ function customer_list_row($label, $name, $selected_id=null, $all_option = false
 function customer_branches_list($customer_id, $name, $selected_id=null,
        $spec_option = true, $enabled=true, $submit_on_change=false, $editkey = false)
 {
-       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',
+       $where = $enabled ? array("inactive = 0") : array();
+       $ret = combo_input($name, $selected_id, $sql, 'branch_code', 'branch_ref',
        array(
                'where' => $where,
                'order' => array('branch_ref'),
                'spec_option' => $spec_option === true ? _('All branches') : $spec_option,
-               'spec_id' => $all_items,
+               'spec_id' => ALL_TEXT,
                'select_submit'=> $submit_on_change,
                'sel_hint' => _('Select customer branch')
        ) );
+       if ($editkey)
+       {
+               $ret .= add_edit_combo('branch');
+       }
+       return $ret;
 }
 //------------------------------------------------------------------------------------------------
 
@@ -553,14 +588,13 @@ function customer_branches_list_row($label, $customer_id, $name, $selected_id=nu
 
 function locations_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
 {
-       global $all_items;
 
        $sql = "SELECT loc_code, location_name, inactive FROM ".TB_PREF."locations";
 
 return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name',
        array(
                'spec_option' => $all_option === true ? _("All Locations") : $all_option,
-               'spec_id' => $all_items,
+               'spec_id' => ALL_TEXT,
                'select_submit'=> $submit_on_change
        ) );
 }
@@ -670,7 +704,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);
 }
@@ -699,7 +733,6 @@ function dimensions_list_row($label, $name, $selected_id=null, $no_option=false,
 function stock_items_list($name, $selected_id=null, $all_option=false, 
        $submit_on_change=false, $opts=array(), $editkey = false)
 {
-       global $all_items;
 
        $sql = "SELECT stock_id, s.description, c.description, s.inactive, s.editable
                        FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id";
@@ -707,12 +740,12 @@ function stock_items_list($name, $selected_id=null, $all_option=false,
        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',
                'spec_option' => $all_option===true ?  _("All Items") : $all_option,
-               'spec_id' => $all_items,
+               'spec_id' => ALL_TEXT,
                'search_box' => true,
                'search' => array("stock_id", "c.description","s.description"),
                'search_submit' => get_company_pref('no_item_list')!=0,
@@ -721,6 +754,9 @@ 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)
@@ -751,7 +787,6 @@ function stock_items_list_row($label, $name, $selected_id=null, $all_option=fals
 function sales_items_list($name, $selected_id=null, $all_option=false, 
        $submit_on_change=false, $type='', $opts=array())
 {
-       global $all_items;
        // all sales codes
        $sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit,
                         i.inactive, if(count(*)>1, '0', s.editable) as editable
@@ -777,7 +812,7 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
          array(
                'format' => '_format_stock_items',
                'spec_option' => $all_option===true ?  _("All Items") : $all_option,
-               'spec_id' => $all_items,
+               'spec_id' => ALL_TEXT,
                'search_box' => true,
                'search' => array("i.item_code", "c.description", "i.description"),
                'search_submit' => get_company_pref('no_item_list')!=0,
@@ -790,8 +825,11 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
          ), $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,
@@ -846,7 +884,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, 
@@ -855,7 +893,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);
 }
 //------------------------------------------------------------------------------------
@@ -881,7 +919,7 @@ function stock_purchasable_items_list($name, $selected_id=null,
        $all_option=false, $submit_on_change=false, $all=false, $editkey=false)
 {
        return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("mb_flag!= 'M'"), 
+               array('where'=>array("NOT no_purchase"), 
                        'show_inactive'=>$all), $editkey);
 }
 //
@@ -893,7 +931,7 @@ function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
        if ($label != null)
                echo "<td>$label</td>\n";
        echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("mb_flag!= 'M'"), 
+               array('where'=>array("NOT no_purchase"), 
                         'editable' => 30,
                         'cells'=>true), $editkey);
 }
@@ -1274,29 +1312,6 @@ 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";
-       return combo_input($name, $selected_id, $sql, 'id', 'name', array());
-}
-
-function movement_types_list_cells($label, $name, $selected_id=null)
-{
-       if ($label != null)
-               echo "<td>$label</td>\n";
-       echo "<td>";
-       echo movement_types_list($name, $selected_id);
-       echo "</td>\n";
-}
-
-function movement_types_list_row($label, $name, $selected_id=null)
-{
-       echo "<tr><td class='label'>$label</td>";
-       movement_types_list_cells(null, $name, $selected_id);
-       echo "</tr>\n";
-}
-
-//-----------------------------------------------------------------------------------------------
 function _format_date($row)
 {
        return sql2date($row['reconciled']);
@@ -1336,14 +1351,13 @@ function bank_reconciliation_list_row($label, $account, $name, $selected_id=null
 
 function workcenter_list($name, $selected_id=null, $all_option=false)
 {
-       global $all_items;
 
        $sql = "SELECT id, name, inactive FROM ".TB_PREF."workcentres";
 
        return combo_input($name, $selected_id, $sql, 'id', 'name',
        array(
                'spec_option' =>$all_option===true ? _("All Suppliers") : $all_option,
-               'spec_id' => $all_items,
+               'spec_id' => ALL_TEXT,
        ) );
 }
 
@@ -1366,7 +1380,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";
@@ -1375,6 +1389,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
        ) );
 }
@@ -1396,17 +1412,20 @@ function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha
 }
 //-----------------------------------------------------------------------------------------------
 
-function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false, $all_option=false)
 {
+
        $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";
        echo "<td>";
        echo combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
        array(
+               'spec_option' => $all_option,
+               'spec_id' => ALL_TEXT,
                'format' => '_format_add_curr',
                'select_submit'=> $submit_on_change,
                'async' => true
@@ -1439,17 +1458,16 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub
 //-----------------------------------------------------------------------------------------------
 // Payment type selector for current user.
 //
-function sale_payment_list($name, $selected_id=null, $submit_on_change=true)
+function sale_payment_list($name, $category, $selected_id=null, $submit_on_change=true, $prepayments=true)
 {
        $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
-       $paym = get_sales_point(user_pos());
 
-       if (!$paym['cash_sale'] || !$paym['credit_sale']) {
-               if ($paym['cash_sale']) // only cash
+       if ($category == PM_CASH) // only cash
                        $sql .= " WHERE days_before_due=0 AND day_in_following_month=0";
-               else
-                       $sql .= " WHERE days_before_due!=0 OR day_in_following_month!=0";
-       }
+       elseif ($category == PM_CREDIT) // only delayed payments
+                       $sql .= " WHERE days_before_due".($prepayments ? '!=': '>')."0 OR day_in_following_month!=0";
+       elseif (!$prepayments)
+                       $sql .= " WHERE days_before_due>=0";
 
        return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms',
        array(
@@ -1459,13 +1477,13 @@ function sale_payment_list($name, $selected_id=null, $submit_on_change=true)
 
 }
 
-function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=true)
+function sale_payment_list_cells($label, $name, $category, $selected_id=null, $submit_on_change=true, $prepayments=true)
 {
        if ($label != null)
                echo "<td class='label'>$label</td>\n";
        echo "<td>";
 
-       echo sale_payment_list($name, $selected_id, $submit_on_change);
+       echo sale_payment_list($name, $category, $selected_id, $submit_on_change, $prepayments);
 
        echo "</td>\n";
 }
@@ -1532,15 +1550,15 @@ 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=true)
 {
-       global $all_items;
 
        $sql = "SELECT id, name FROM ".TB_PREF."chart_types";
 
        return combo_input($name, $selected_id, $sql, 'id', 'name',
        array(
-               'order' => 'class_id', 'id',
+               'format' => '_format_account',
+               'order' => array('class_id', 'id', 'parent'),
                'spec_option' =>$all_option,
-               'spec_id' => $all_items
+               'spec_id' => ALL_TEXT
        ) );
 }
 
@@ -1582,6 +1600,7 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
                'format' => '_format_account',
                'spec_option' => $all_option===true ?  _("Use Item Sales Accounts") : $all_option,
                'spec_id' => '',
+               'type' => 2,
                'order' => array('type.class_id','type.id','account_code'),
                'search_box' => $cells,
                        'search_submit' => false,
@@ -1652,30 +1671,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";
 }
 
@@ -1756,37 +1776,37 @@ function wo_types_list_row($label, $name, $selected_id=null)
 
 function dateformats_list_row($label, $name, $value=null)
 {
-       global $dateformats;
+       global $SysPrefs;
 
        echo "<tr><td class='label'>$label</td>\n<td>";
-       echo array_selector( $name, $value, $dateformats );
+       echo array_selector( $name, $value, $SysPrefs->dateformats );
        echo "</td></tr>\n";
 }
 
 function dateseps_list_row($label, $name, $value=null)
 {
-       global $dateseps;
+       global $SysPrefs;
 
        echo "<tr><td class='label'>$label</td>\n<td>";
-       echo array_selector( $name, $value, $dateseps );
+       echo array_selector( $name, $value, $SysPrefs->dateseps );
        echo "</td></tr>\n";
 }
 
 function thoseps_list_row($label, $name, $value=null)
 {
-       global $thoseps;
+       global $SysPrefs;
 
        echo "<tr><td class='label'>$label</td>\n<td>";
-       echo array_selector( $name, $value, $thoseps );
+       echo array_selector( $name, $value, $SysPrefs->thoseps );
        echo "</td></tr>\n";
 }
 
 function decseps_list_row($label, $name, $value=null)
 {
-       global $decseps;
+       global $SysPrefs;
 
        echo "<tr><td class='label'>$label</td>\n<td>";
-       echo array_selector( $name, $value, $decseps );
+       echo array_selector( $name, $value, $SysPrefs->decseps );
        echo "</td></tr>\n";
 }
 
@@ -1813,10 +1833,10 @@ function themes_list_row($label, $name, $value=null)
 
 function pagesizes_list_row($label, $name, $value=null)
 {
-       global $pagesizes;
+       global $SysPrefs;
 
        $items = array();
-       foreach ($pagesizes as $pz)
+       foreach ($SysPrefs->pagesizes as $pz)
                $items[$pz] = $pz;
 
        echo "<tr><td class='label'>$label</td>\n<td>";
@@ -1824,11 +1844,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,
@@ -1838,19 +1860,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, false, $submit_on_change);
+       systypes_list_cells(null, $name, $value, $submit_on_change, $exclude);
        echo "</tr>\n";
 }
 
@@ -1865,8 +1887,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, 
@@ -1882,13 +1903,12 @@ function journal_types_list_cells($label, $name, $value=null, $submit_on_change=
 
 function cust_allocations_list_cells($label, $name, $selected=null)
 {
-       global $all_items;
 
        if ($label != null)
                label_cell($label);
        echo "<td>\n";
        $allocs = array( 
-               $all_items=>_("All Types"),
+               ALL_TEXT=>_("All Types"),
                '1'=> _("Sales Invoices"),
                '2'=> _("Overdue Invoices"),
                '3' => _("Payments"),
@@ -1901,17 +1921,34 @@ function cust_allocations_list_cells($label, $name, $selected=null)
 
 function supp_allocations_list_cell($name, $selected=null)
 {
-       global $all_items;
 
        echo "<td>\n";
        $allocs = array( 
-               $all_items=>_("All Types"),
+               ALL_TEXT=>_("All Types"),
+               '1'=> _("Invoices"),
+               '2'=> _("Overdue Invoices"),
+               '3' => _("Payments"),
+               '4' => _("Credit Notes"),
+               '5' => _("Overdue Credit Notes")
+       );
+       echo array_selector($name, $selected, $allocs);
+       echo "</td>\n";
+}
+
+function supp_transactions_list_cell($name, $selected=null)
+{
+
+       echo "<td>\n";
+       $allocs = array( 
+               ALL_TEXT=>_("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";
 }
@@ -2105,7 +2142,6 @@ function class_types_list_row($label, $name, $selected_id=null, $submit_on_chang
 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";
 
@@ -2136,7 +2172,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;
        
@@ -2144,12 +2180,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);
@@ -2217,4 +2247,201 @@ function extset_list($name, $value=null, $submit_on_change=false)
                ));
 }
 
-?>
\ 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' => '',
+               ));
+}
+
+function tax_algorithm_list($name, $value=null, $submit_on_change = false)
+{
+       global $tax_algorithms;
+       
+       return array_selector($name, $value, $tax_algorithms, 
+               array( 
+                       'select_submit'=> $submit_on_change,
+                       'async' => true,
+                       )
+       );
+}
+
+function tax_algorithm_list_cells($label, $name, $value=null, $submit_on_change=false)
+{
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+       echo tax_algorithm_list($name, $value, $submit_on_change);
+       echo "</td>\n";
+}
+
+function tax_algorithm_list_row($label, $name, $value=null, $submit_on_change=false)
+{
+       echo "<tr><td class='label'>$label</td>";
+       tax_algorithm_list_cells(null, $name, $value, $submit_on_change);
+       echo "</tr>\n";
+}
+//----------------------------------------------------------------------------------------------
+
+function subledger_list($name, $account, $selected_id=null)
+{
+
+       $type = is_subledger_account($account);
+       if (!$type)
+               return '';
+
+       if($type > 0)
+               $sql = "SELECT DISTINCT d.debtor_no as id, debtor_ref as name 
+               FROM "
+               .TB_PREF."debtors_master d,"
+               .TB_PREF."cust_branch c
+               WHERE d.debtor_no=c.debtor_no AND c.receivables_account=".db_escape($account);
+       else
+               $sql = "SELECT supplier_id as id, supp_ref as name 
+               FROM "
+               .TB_PREF."suppliers s
+               WHERE s.payable_account=".db_escape($account);
+
+       $mode = get_company_pref('no_customer_list');
+
+       return combo_input($name, $selected_id, $sql, 'id', 'name',
+       array(
+               'type' => 1,
+               'size' => 20,
+               'async' => false,
+       ) );
+}
+
+function subledger_list_cells($label, $name, $account, $selected_id=null)
+{
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td nowrap>";
+       echo subledger_list($name, $account, $selected_id);
+       echo "</td>\n";
+}
+
+function subledger_list_row($label, $name, $selected_id=null, $all_option = false, 
+       $submit_on_change=false, $show_inactive=false, $editkey = false)
+{
+       echo "<tr><td class='label'>$label</td><td nowrap>";
+       echo subledger_list($name, $account, $selected_id);
+       echo "</td>\n</tr>\n";
+}
+
+function accounts_type_list_row($label, $name, $selected_id=null)
+{
+       echo "<tr>";
+       if ($label != null)
+               echo "<td class='label'>$label</td>\n";
+       echo "<td>";
+       $sel = array(_("Numeric"), _("Alpha Numeric"), _("ALPHA NUMERIC"));
+       echo array_selector($name, $selected_id, $sel); 
+       echo "</td></tr>\n";
+}
+
+function users_list_cells($label, $name, $selected_id=null, $submit_on_change=false, $spec_opt=true)
+{
+    $where = false;
+    $sql = " SELECT user_id, real_name FROM ".TB_PREF."users";
+
+    if ($label != null)
+        echo "<td>$label</td>\n";
+    echo "<td>";
+
+    echo combo_input($name, $selected_id, $sql, 'user_id', 'real_name',
+        array(
+            'spec_option' => $spec_opt===true ?_("All users") : $spec_opt,
+            'spec_id' => '',
+            'order' => 'real_name',
+            'select_submit'=> $submit_on_change,
+            'async' => false
+        ) );
+    echo "</td>";
+
+}
+