Sales group query error in mysql 8. groups is a reserved word. Fixed
[fa-stable.git] / includes / ui / ui_lists.inc
index d108986fe46e84c4939cdf888bc2a41a7234f7f5..45253e32fd01c20585149b7fb935d012d4d7d051 100644 (file)
@@ -25,9 +25,9 @@ define('SELECT_BUTTON', "<input %s type='submit' class='combo_select' style='bor
 //     Options are merged with defaults.
 
 function combo_input($name, $selected_id, $sql, $valfield, $namefield,
-       $options=null)
+       $options=null, $type=null)
 {
-global $Ajax;
+global $Ajax, $path_to_root, $SysPrefs ;
 
 $opts = array(         // default options
        'where'=> array(),              // additional constraints
@@ -150,7 +150,7 @@ $opts = array(              // default options
                                        foreach($opts['search'] as $i=> $s)
                                                $opts['search'][$i] = $s . " LIKE "
                                                        .db_escape(($class=='combo3' ? '' : '%').$txt.'%');
-                                       $opts['where'][] = '('. implode($opts['search'], ' OR ') . ')';
+                                       $opts['where'][] = '('. implode(' OR ', $opts['search']) . ')';
                                }
                }
        }
@@ -158,7 +158,7 @@ $opts = array(              // default options
        // sql completion
        if (count($opts['where'])) {
                $where = strpos($sql, 'WHERE')==false ? ' WHERE ':' AND ';
-               $where .= '('. implode($opts['where'], ' AND ') . ')';
+               $where .= '('. implode(' AND ', $opts['where']) . ')';
                $group_pos = strpos($sql, 'GROUP BY');
                if ($group_pos) {
                        $group = substr($sql, $group_pos);
@@ -180,13 +180,14 @@ $opts = array(            // default options
        $found = false;
        $lastcat = null;
        $edit = false;
-//if($name=='stock_id')        display_notification('<pre>'.print_r($_POST, true).'</pre>');
-//if($name=='curr_default') display_notification($opts['search_submit']);
+       $pname = false;
+       if (($type === "customer" || $type === "supplier") && !empty($SysPrefs->prefs['shortname_name_in_list']))
+               $pname = true;
        if($result = db_query($sql)) {
                while ($contact_row = db_fetch($result)) {
                        $value = $contact_row[0];
                        $descr = $opts['format']==null ?  $contact_row[1] :
-                               call_user_func($opts['format'], $contact_row);
+                               call_user_func($opts['format'], $contact_row, $pname);
                        $sel = '';
                        if (get_post($search_button) && ($txt == $value)) {
                                $selected_id[] = $value;
@@ -229,8 +230,6 @@ $opts = array(              // default options
        if ($spec_option !== false) { // if special option used - add it
                $first_id = $spec_id;
                $first_opt = $spec_option;
-//     }
-//     if($first_id !== false) {
                $sel = $found===false ? 'selected' : '';
                $optclass = @$contact_row['inactive'] ? "class='inactive'" : '';
                $selector = "<option $sel value='$first_id'>$first_opt</option>\n"
@@ -243,11 +242,16 @@ $opts = array(            // default options
        
        $_POST[$name] = $multi ? $selected_id : $selected_id[0];
 
-       $selector = "<select autocomplete='off' ".($multi ? "multiple" : '')
+       if ($SysPrefs->use_popup_search)
+               $selector = "<select id='$name' autocomplete='off' ".($multi ? "multiple" : '')
+               . ($opts['height']!==false ? ' size="'.$opts['height'].'"' : '')
+               . "$disabled name='$name".($multi ? '[]':'')."' class='$class' title='"
+               . $opts['sel_hint']."' $rel>".$selector."</select>\n";
+       else
+               $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) {
@@ -291,13 +295,81 @@ $opts = array(            // default options
        }
        default_focus(($search_box && $by_id) ? $search_box : $name);
 
+       $img = "";
+       if ($SysPrefs->use_popup_search && (!isset($opts['fixed_asset']) || !$opts['fixed_asset']))
+       {
+               $img_title = "";
+               $link = "";
+               $id = $name;
+               if ($SysPrefs->use_popup_windows) {
+                       if ($type != NULL) {
+                       switch (strtolower($type)) {
+                               case "stock":
+                                       $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=all&client_id=" . $id;
+                                       $img_title = _("Search items");
+                                       break;
+                               case "stock_manufactured":
+                                       $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=manufactured&client_id=" . $id;
+                                       $img_title = _("Search items");
+                                       break;
+                               case "stock_purchased":
+                                       $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=purchasable&client_id=" . $id;
+                                       $img_title = _("Search items");
+                                       break;
+                               case "stock_sales":
+                                       $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=sales&client_id=" . $id;
+                                       $img_title = _("Search items");
+                                       break;
+                               case "stock_costable":
+                                       $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=costable&client_id=" . $id;
+                                       $img_title = _("Search items");
+                                       break;
+                               case "component":
+                                       $parent = $opts['parent'];
+                                       $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=component&parent=".$parent."&client_id=" . $id;
+                                       $img_title = _("Search items");
+                                       break;
+                               case "kits":
+                                       $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=kits&client_id=" . $id;
+                                       $img_title = _("Search items");
+                                       break;
+                               case "customer":
+                                       $link = $path_to_root . "/sales/inquiry/customers_list.php?popup=1&client_id=" . $id;
+                                       $img_title = _("Search customers");
+                                       break;
+                               case "branch":
+                                       $link = $path_to_root . "/sales/inquiry/customer_branches_list.php?popup=1&client_id=" . $id . "#customer_id";
+                                       $img_title = _("Search branches");
+                                       break;
+                               case "supplier":
+                                       $link = $path_to_root . "/purchasing/inquiry/suppliers_list.php?popup=1&client_id=" . $id;
+                                       $img_title = _("Search suppliers");
+                                       break;
+                               case "account":
+                               case "account2":
+                                       $skip = strtolower($type) == "account" ? false : true;
+                                       $link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&skip=".$skip."&client_id=" . $id;
+                                       $img_title = _("Search GL accounts");
+                                       break;
+                       }
+               }
+               }
+
+               if ($link !=="") {
+               $theme = user_theme();
+               $img = '<img src="'.$path_to_root.'/themes/'.$theme.'/images/'.ICON_VIEW.
+                       '" style="vertical-align:middle;width:12px;height:12px;border:0;" onclick="javascript:lookupWindow(&quot;'.
+                       $link.'&quot;, &quot;&quot;);" title="' . $img_title . '" style="cursor:pointer;" />';
+               }
+       }
+
        if ($opts['editlink'])
                $selector .= ' '.$opts['editlink'];
 
        if ($search_box && $opts['cells'])
-               $str = ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector</td>";
+               $str = ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td nowrap>$selector$img</td>";
        else
-               $str = $edit_entry.$selector;
+               $str = $edit_entry.$selector.$img;
        return $str;
 }
 
@@ -356,19 +428,18 @@ $opts = array(            // default options
        $selector = $first_opt = '';
        $first_id = false;
        $found = false;
-//if($name=='SelectStockFromList') display_error($sql);
-               foreach($items as $value=>$descr) {
-                       $sel = '';
-                       if (in_array((string)$value, $selected_id, true)) {
-                               $sel = 'selected';
-                               $found = $value;
-                       }
-                       if ($first_id === false) {
-                               $first_id = $value;
-                               $first_opt = $descr;
-                       }
-                       $selector .= "<option $sel value='$value'>$descr</option>\n";
+       foreach($items as $value=>$descr) {
+               $sel = '';
+               if (in_array((string)$value, $selected_id, true)) {
+                       $sel = 'selected';
+                       $found = $value;
+               }
+               if ($first_id === false) {
+                       $first_id = $value;
+                       $first_opt = $descr;
                }
+               $selector .= "<option $sel value='$value'>$descr</option>\n";
+       }
 
        if ($first_id!==false) {
                $sel = ($found===$first_id) || ($found===false && ($spec_option===false)) ? "selected='selected'" : '';
@@ -406,8 +477,15 @@ $opts = array(             // default options
        return $selector;
 }
 //----------------------------------------------------------------------------------------------
+function array_selector_row($label, $name, $selected_id, $items, $options=null)
+{
+       echo "<tr><td class='label'>$label</td>\n<td>";
+       echo array_selector($name, $selected_id, $items, $options);
+       echo "</td></tr>\n";
+}
 
-function _format_add_curr($row)
+//----------------------------------------------------------------------------------------------
+function _format_add_curr($row, $pname=false)
 {
        static $company_currency;
 
@@ -415,8 +493,14 @@ function _format_add_curr($row)
        {
                $company_currency = get_company_currency();
        }
-       return $row[1] . ($row[2] == $company_currency ?
-               '' : ("&nbsp;-&nbsp;" . $row[2]));
+       if (!$pname)
+       {
+               return $row[1] . ($row[2] == $company_currency ? '' : ("&nbsp;-&nbsp;" . $row[2]));
+       }               
+       else
+       {
+               return $row[1] . "&nbsp;-&nbsp;" . $row[2] . ($row[3] == $company_currency ? '' : ("&nbsp;-&nbsp;" . $row[3]));
+       }               
 }
 
 function add_edit_combo($type)
@@ -437,8 +521,11 @@ function add_edit_combo($type)
 function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
        $all=false, $editkey = false)
 {
-
-       $sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers ";
+       global $SysPrefs;
+       if (!empty($SysPrefs->prefs['shortname_name_in_list']))
+               $sql = "SELECT supplier_id, supp_ref, supp_name, curr_code, inactive FROM ".TB_PREF."suppliers ";
+       else    
+               $sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers ";
 
        $mode = get_company_pref('no_supplier_list');
 
@@ -460,7 +547,7 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
                _('Select supplier'),
                'show_inactive'=>$all,
                'editlink' => $editkey ? add_edit_combo('supplier') : false
-               ));
+               ), "supplier");
        return $ret;
 }
 
@@ -468,10 +555,11 @@ function supplier_list_cells($label, $name, $selected_id=null, $all_option=false
        $submit_on_change=false, $all=false, $editkey = false)
 {
        if ($label != null)
-               echo "<td>$label</td><td>\n";
-               echo supplier_list($name, $selected_id, $all_option, $submit_on_change, 
+               echo "<td>$label</td>\n";
+       echo "<td>";    
+       echo supplier_list($name, $selected_id, $all_option, $submit_on_change, 
                $all, $editkey);
-               echo "</td>\n";
+       echo "</td>\n";
 }
 
 function supplier_list_row($label, $name, $selected_id=null, $all_option = false, 
@@ -487,8 +575,11 @@ 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)
 {
-
-       $sql = "SELECT debtor_no, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master ";
+       global $SysPrefs;
+       if (!empty($SysPrefs->prefs['shortname_name_in_list']))
+               $sql = "SELECT debtor_no, debtor_ref, name, curr_code, inactive FROM ".TB_PREF."debtors_master ";
+       else    
+               $sql = "SELECT debtor_no, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master ";
 
        $mode = get_company_pref('no_customer_list');
 
@@ -511,7 +602,7 @@ function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_
                _('Select customer'),
                'show_inactive' => $show_inactive,
                'editlink' => $editkey ? add_edit_combo('customer') : false
-       ) );
+       ), "customer" );
        return $ret;
 }
 
@@ -558,7 +649,7 @@ function customer_branches_list($customer_id, $name, $selected_id=null,
                'select_submit'=> $submit_on_change,
                'sel_hint' => _('Select customer branch'),
                'editlink' => $editkey ? add_edit_combo('branch') : false
-       ) );
+       ), "branch" );
        return $ret;
 }
 //------------------------------------------------------------------------------------------------
@@ -585,48 +676,50 @@ 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)
+function locations_list($name, $selected_id=null, $all_option=false, $submit_on_change=false, $fixed_asset=false)
 {
 
-       $sql = "SELECT loc_code, location_name, inactive FROM ".TB_PREF."locations";
+       $sql = "SELECT loc_code, location_name, inactive FROM ".TB_PREF."locations WHERE fixed_asset=".(int)$fixed_asset;
 
-return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name',
-       array(
-               'spec_option' => $all_option === true ? _("All Locations") : $all_option,
-               'spec_id' => ALL_TEXT,
-               'select_submit'=> $submit_on_change
-       ) );
+       return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name',
+               array(
+                       'spec_option' => $all_option === true ? _("All Locations") : $all_option,
+                       'spec_id' => ALL_TEXT,
+                       'select_submit'=> $submit_on_change
+               ) );
 }
 
-function locations_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function locations_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $fixed_asset=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       echo locations_list($name, $selected_id, $all_option, $submit_on_change);
+       echo locations_list($name, $selected_id, $all_option, $submit_on_change, $fixed_asset);
        echo "</td>\n";
 }
 
-function locations_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function locations_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $fixed_asset=false)
 {
        echo "<tr><td class='label'>$label</td>";
-       locations_list_cells(null, $name, $selected_id, $all_option, $submit_on_change);
+       locations_list_cells(null, $name, $selected_id, $all_option, $submit_on_change, $fixed_asset);
        echo "</tr>\n";
 }
 
 //-----------------------------------------------------------------------------------------------
 
-function currencies_list($name, $selected_id=null, $submit_on_change=false)
+function currencies_list($name, $selected_id=null, $submit_on_change=false, $exclude_home_curr=false)
 {
        $sql = "SELECT curr_abrev, currency, inactive FROM ".TB_PREF."currencies";
+       if ($exclude_home_curr)
+               $sql .= " WHERE curr_abrev!='".get_company_currency()."'";
 
-// default to the company currency
-return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency',
-       array(
-               'select_submit'=> $submit_on_change,
-               'default' => get_company_currency(),
-               'async' => false                
-       ) );
+       // default to the company currency
+       return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency',
+               array(
+                       'select_submit'=> $submit_on_change,
+                       'default' => get_company_currency(),
+                       'async' => false
+               ) );
 }
 
 function currencies_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
@@ -652,16 +745,16 @@ function fiscalyears_list($name, $selected_id=null, $submit_on_change=false)
 
        $sql = "SELECT * FROM ".TB_PREF."fiscal_year";
 
-// default to the company current fiscal year
+       // default to the company current fiscal year
 
-return combo_input($name, $selected_id, $sql, 'id', '',
-       array(
-               'order' => 'begin',
-               'default' => get_company_pref('f_year'),
-               'format' => '_format_fiscalyears',
-               'select_submit'=> $submit_on_change,
-               'async' => false
-       ) );
+       return combo_input($name, $selected_id, $sql, 'id', '',
+               array(
+                       'order' => 'begin',
+                       'default' => get_company_pref('f_year'),
+                       'format' => '_format_fiscalyears',
+                       'select_submit'=> $submit_on_change,
+                       'async' => false
+               ) );
 }
 
 function _format_fiscalyears($row)
@@ -690,14 +783,14 @@ function fiscalyears_list_row($label, $name, $selected_id=null)
 function dimensions_list($name, $selected_id=null, $no_option=false, $showname=' ',
        $submit_on_change=false, $showclosed=false, $showtype=1)
 {
-$sql = "SELECT id, CONCAT(reference,'  ',name) as ref FROM ".TB_PREF."dimensions";
+       $sql = "SELECT id, CONCAT(reference,'  ',name) as ref FROM ".TB_PREF."dimensions";
 
-$options = array(
-       'order' => 'reference',
-       'spec_option'=>$no_option ? $showname : false,
-       'spec_id' => 0,
-       'select_submit'=> $submit_on_change,
-       'async' => false,
+       $options = array(
+               'order' => 'reference',
+               'spec_option'=>$no_option ? $showname : false,
+               'spec_id' => 0,
+               'select_submit'=> $submit_on_change,
+               'async' => false,
        );
 
        if (!$showclosed)
@@ -730,32 +823,36 @@ 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)
+       $submit_on_change=false, $opts=array(), $editkey = false, $type = "stock")
 {
-
        $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 (isset($opts['fixed_asset']) && $opts['fixed_asset'])
+               $sql .= " AND mb_flag='F'";
+       else
+               $sql .= " AND mb_flag!='F'";
+
        if ($editkey)
                set_editor('item', $name, $editkey);
 
        $ret = combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
-       array_merge(
-         array(
-               'format' => '_format_stock_items',
-               'spec_option' => $all_option===true ?  _("All Items") : $all_option,
-               'spec_id' => ALL_TEXT,
-               'search_box' => true,
-               'search' => array("stock_id", "c.description","s.description"),
-               'search_submit' => get_company_pref('no_item_list')!=0,
-               'size'=>10,
-               'select_submit'=> $submit_on_change,
-               'category' => 2,
-               'order' => array('c.description','stock_id'),
-               'editlink' => $editkey ? add_edit_combo('item') : false,
-               'editable' => false,
-               'max' => 255
-         ), $opts) );
+               array_merge(
+                 array(
+                       'format' => '_format_stock_items',
+                       'spec_option' => $all_option===true ?  _("All Items") : $all_option,
+                       'spec_id' => ALL_TEXT,
+                       'search_box' => true,
+                       'search' => array("stock_id", "c.description","s.description"),
+                       'search_submit' => get_company_pref('no_item_list')!=0 && (!isset($opts['fixed_asset']) || !$opts['fixed_asset']),
+                       'size'=>10,
+                       'select_submit'=> $submit_on_change,
+                       'category' => 2,
+                       'order' => array('c.description','stock_id'),
+                       'editlink' => $editkey ? add_edit_combo('item') : false,
+                       'editable' => false,
+                       'max' => 255
+                 ), $opts), $type );
        return $ret;
 }
 
@@ -767,10 +864,25 @@ function _format_stock_items($row)
 function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, 
        $submit_on_change=false, $all=false, $editkey = false, $opts= array())
 {
+       if (isset($opts['fixed_asset']) && $opts['fixed_asset'])
+               $editor_item = 'fa_item';
+       else
+               $editor_item = 'item';
+
+//     if ($editkey) ??
+//             set_editor($editor_item, $name, $editkey);
+
        if ($label != null)
                echo "<td>$label</td>\n";
+
+// ??
+//  $opts = array_merge($options, array('cells'=>true, 'show_inactive'=>$all, 'new_icon' => $editkey ? 'item' : false));
+//
+//     echo stock_items_list($name, $selected_id, $all_option, $submit_on_change, $opts);
+
        echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
                array_merge(array('cells'=>true, 'show_inactive'=>$all), $opts), $editkey);
+
 }
 /*
 function stock_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
@@ -796,7 +908,8 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
                        LEFT JOIN
                        ".TB_PREF."stock_category c
                        ON i.category_id=c.category_id
-                       WHERE i.stock_id=s.stock_id";
+                       WHERE i.stock_id=s.stock_id
+      AND mb_flag != 'F'";
 
        
        if ($type == 'local')   { // exclude foreign codes
@@ -808,21 +921,21 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
        $sql .= " GROUP BY i.item_code";
 
        return combo_input($name, $selected_id, $sql, 'i.item_code', 'c.description',
-       array_merge(
-         array(
-               'format' => '_format_stock_items',
-               'spec_option' => $all_option===true ?  _("All Items") : $all_option,
-               'spec_id' => ALL_TEXT,
-               'search_box' => true,
-               'search' => array("i.item_code", "c.description", "i.description"),
-               'search_submit' => get_company_pref('no_item_list')!=0,
-               'size'=>15,
-               'select_submit'=> $submit_on_change,
-               'category' => 2,
-               'order' => array('c.description','i.item_code'),
-               'editable' => 30,
-               'max' => 255
-         ), $opts) );
+               array_merge(
+                 array(
+                       'format' => '_format_stock_items',
+                       'spec_option' => $all_option===true ?  _("All Items") : $all_option,
+                       'spec_id' => ALL_TEXT,
+                       'search_box' => true,
+                       'search' => array("i.item_code", "c.description", "i.description"),
+                       'search_submit' => get_company_pref('no_item_list')!=0,
+                       'size'=>15,
+                       'select_submit'=> $submit_on_change,
+                       'category' => 2,
+                       'order' => array('c.description','i.item_code'),
+                       'editable' => 30,
+                       'max' => 255
+                 ), $opts), $type == 'kits' ? $type : "stock_sales" );
 }
 
 function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $editkey=false)
@@ -833,7 +946,7 @@ function sales_items_list_cells($label, $name, $selected_id=null, $all_option=fa
        if ($label != null)
                echo "<td>$label</td>\n";
        echo sales_items_list($name, $selected_id, $all_option, $submit_on_change,
-               '', array('cells'=>true));
+               '', array('cells'=>true, 'max'=>50)); // maximum is set to 50 and not default 255.
 }
 
 function sales_kits_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
@@ -858,7 +971,7 @@ function stock_manufactured_items_list($name, $selected_id=null,
        $all_option=false, $submit_on_change=false)
 {
        return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("mb_flag= 'M'")));
+               array('where'=>array("mb_flag= 'M'")), false, "stock_manufactured");
 }
 
 function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
@@ -883,18 +996,20 @@ function stock_manufactured_items_list_row($label, $name, $selected_id=null,
 function stock_component_items_list($name, $parent_stock_id, $selected_id=null,
        $all_option=false, $submit_on_change=false, $editkey = false)
 {
+       $parent = db_escape($parent_stock_id);
        return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("stock_id != ".db_escape($parent_stock_id))), $editkey);
+               array('where'=>array("stock_id != $parent"), 'parent'=> $parent_stock_id), $editkey, "component");
 }
 
+
 function stock_component_items_list_cells($label, $name, $parent_stock_id, 
        $selected_id=null, $all_option=false, $submit_on_change=false, $editkey = false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
+       $parent = db_escape($parent_stock_id);
        echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("stock_id != ".db_escape($parent_stock_id)), 'cells'=>true),
-               $editkey);
+               array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true, 'parent'=> $parent_stock_id), $editkey, "component");
 }
 //------------------------------------------------------------------------------------
 
@@ -902,7 +1017,7 @@ function stock_costable_items_list($name, $selected_id=null,
        $all_option=false, $submit_on_change=false)
 {
        return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("mb_flag!='D'")));
+               array('where'=>array("mb_flag!='D'")), false, "stock_costable");
 }
 
 function stock_costable_items_list_cells($label, $name, $selected_id=null, 
@@ -911,7 +1026,7 @@ function stock_costable_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!='D'"), 'cells'=>true));
+               array('where'=>array("mb_flag!='D'"), 'cells'=>true), false, "stock_costable");
 }
 
 //------------------------------------------------------------------------------------
@@ -920,7 +1035,7 @@ function stock_purchasable_items_list($name, $selected_id=null,
 {
        return stock_items_list($name, $selected_id, $all_option, $submit_on_change,
                array('where'=>array("NOT no_purchase"), 
-                       'show_inactive'=>$all), $editkey);
+                       'show_inactive'=>$all), $editkey, "stock_purchased");
 }
 //
 //     This helper is used in PO/GRN/PI entry and supports editable descriptions.
@@ -935,16 +1050,7 @@ function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
                         '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)
-{
-       echo "<tr><td class='label'>$label</td>";
-       stock_purchasable_items_list_cells(null, $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)
@@ -981,17 +1087,102 @@ function stock_units_list_row($label, $name, $value=null, $enabled=true)
 
 //------------------------------------------------------------------------------------
 
+function stock_purchasable_fa_list_cells($label, $name, $selected_id=null, $all_option=false,
+       $submit_on_change=false, $all=false, $editkey = false, $exclude_items = array())
+{
+       // Check if a fixed asset has been bought.
+       $where_opts[] = "stock_id NOT IN
+       ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE type=".ST_SUPPRECEIVE." AND qty!=0 )";
+
+       // exclude items currently on the order.
+       foreach($exclude_items as $item) {
+       $where_opts[] = "stock_id != ".db_escape($item->stock_id);
+       }
+       $where_opts[] = "mb_flag='F'";
+
+       echo stock_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change, $all, $editkey, 
+    array('fixed_asset' => true, 'where' => $where_opts));
+}
+
+function stock_disposable_fa_list($name, $selected_id=null,
+       $all_option=false, $submit_on_change=false)
+{
+       // Check if a fixed asset has been bought....
+       $where_opts[] = "stock_id IN
+       ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE type=".ST_SUPPRECEIVE." AND qty!=0 )";
+       // ...but has not been disposed or sold already.
+       $where_opts[] = "stock_id NOT IN
+               ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE (type=".ST_CUSTDELIVERY." OR type=".ST_INVADJUST.") AND qty!=0 )";
+
+       $where_opts[] = "mb_flag='F'";
+
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+    array('fixed_asset' => true, 'where' => $where_opts));
+}
+
+function stock_disposable_fa_list_cells($label, $name, $selected_id=null,
+       $all_option=false, $submit_on_change=false, $exclude_items = array())
+{
+       // Check if a fixed asset has been bought....
+       $where_opts[] = "stock_id IN
+       ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE type=".ST_SUPPRECEIVE." AND qty!=0 )";
+       // ...but has not been disposed or sold already.
+       $where_opts[] = "stock_id NOT IN
+       ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE (type=".ST_CUSTDELIVERY." OR type=".ST_INVADJUST.") AND qty!=0 )";
+
+       $where_opts[] = "mb_flag='F'";
+
+       foreach($exclude_items as $item) {
+       $where_opts[] = "stock_id != ".db_escape($item->stock_id);
+       }
+
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change, 
+    array('fixed_asset' => true, 'cells'=>true, 'where' => $where_opts));
+}
+
+function stock_depreciable_fa_list_cells($label, $name, $selected_id=null,
+       $all_option=false, $submit_on_change=false)
+{
+
+       // Check if a fixed asset has been bought....
+       $where_opts[] = "stock_id IN
+       ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE type=".ST_SUPPRECEIVE." AND qty!=0 )";
+       // ...but has not been disposed or sold already.
+       $where_opts[] = "stock_id NOT IN
+       ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE (type=".ST_CUSTDELIVERY." OR type=".ST_INVADJUST.") AND qty!=0 )";
+
+       $year = get_current_fiscalyear();
+       $begin = date2sql(add_months(sql2date($year['begin']), -1));
+       $end = date2sql(add_months(sql2date($year['end']), -1));
+
+       // check if current fiscal year
+       $where_opts[] = "depreciation_date <= '".$end."'";
+       $where_opts[] = "depreciation_date >= '".$begin."'";
+
+       $where_opts[] = "material_cost > 0";
+       $where_opts[] = "mb_flag='F'";
+
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+                array('fixed_asset' => true, 'where' => $where_opts, 'cells'=>true));
+}
+
+//------------------------------------------------------------------------------------
+
 function tax_types_list($name, $selected_id=null, $none_option=false, $submit_on_change=false)
 {
        $sql = "SELECT id, CONCAT(name, ' (',rate,'%)') as name FROM ".TB_PREF."tax_types";
 
        return combo_input($name, $selected_id, $sql, 'id', 'name',
-       array(
-               'spec_option' => $none_option,
-               'spec_id' => ALL_NUMERIC,
-               'select_submit'=> $submit_on_change,
-               'async' => false,
-       ) );
+               array(
+                       'spec_option' => $none_option,
+                       'spec_id' => ALL_NUMERIC,
+                       'select_submit'=> $submit_on_change,
+                       'async' => false,
+               ) );
 }
 
 function tax_types_list_cells($label, $name, $selected_id=null, $none_option=false,
@@ -1017,16 +1208,16 @@ function tax_types_list_row($label, $name, $selected_id=null, $none_option=false
 function tax_groups_list($name, $selected_id=null,
        $none_option=false, $submit_on_change=false)
 {
-       $sql = "SELECT id, name FROM ".TB_PREF."tax_groups";
+       $sql = "SELECT id, name, inactive FROM ".TB_PREF."tax_groups";
 
        return combo_input($name, $selected_id, $sql, 'id', 'name',
-       array(
-               'order' => 'id',
-               'spec_option' => $none_option,
-               'spec_id' => ALL_NUMERIC,
-               'select_submit'=> $submit_on_change,
-               'async' => false,
-       ) );
+               array(
+                       'order' => 'id',
+                       'spec_option' => $none_option,
+                       'spec_id' => ALL_NUMERIC,
+                       'select_submit'=> $submit_on_change,
+                       'async' => false,
+               ) );
 }
 
 function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
@@ -1047,25 +1238,28 @@ function tax_groups_list_row($label, $name, $selected_id=null, $none_option=fals
 
 //------------------------------------------------------------------------------------
 
-function item_tax_types_list($name, $selected_id=null)
+function item_tax_types_list($name, $selected_id=null, $show_inactive = false)
 {
        $sql ="SELECT id, name FROM ".TB_PREF."item_tax_types";
+       if (!$show_inactive)
+               $sql .= " WHERE !inactive";
+
        return combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') );
 }
 
-function item_tax_types_list_cells($label, $name, $selected_id=null)
+function item_tax_types_list_cells($label, $name, $selected_id=null, $show_inactive = false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       echo item_tax_types_list($name, $selected_id);
+       echo item_tax_types_list($name, $selected_id, $show_inactive);
        echo "</td>\n";
 }
 
-function item_tax_types_list_row($label, $name, $selected_id=null)
+function item_tax_types_list_row($label, $name, $selected_id=null, $show_inactive = false)
 {
        echo "<tr><td class='label'>$label</td>";
-       item_tax_types_list_cells(null, $name, $selected_id);
+       item_tax_types_list_cells(null, $name, $selected_id, $show_inactive);
        echo "</tr>\n";
 }
 
@@ -1123,25 +1317,27 @@ function sales_persons_list_row($label, $name, $selected_id=null, $spec_opt=fals
 
 //------------------------------------------------------------------------------------
 
-function sales_areas_list($name, $selected_id=null)
+function sales_areas_list($name, $selected_id=null, $special_option=false)
 {
        $sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas";
-       return combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
+       return combo_input($name, $selected_id, $sql, 'area_code', 'description', 
+               array('spec_option' => $special_option===true ? ' ' : $special_option,
+               'order' => 'description', 'spec_id' => 0));
 }
 
-function sales_areas_list_cells($label, $name, $selected_id=null)
+function sales_areas_list_cells($label, $name, $selected_id=null, $special_option=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       echo sales_areas_list($name, $selected_id);
+       echo sales_areas_list($name, $selected_id, $special_option);
        echo "</td>\n";
 }
 
-function sales_areas_list_row($label, $name, $selected_id=null)
+function sales_areas_list_row($label, $name, $selected_id=null, $special_option=false)
 {
        echo "<tr><td class='label'>$label</td>";
-       sales_areas_list_cells(null, $name, $selected_id);
+       sales_areas_list_cells(null, $name, $selected_id, $special_option);
        echo "</tr>\n";
 }
 
@@ -1149,7 +1345,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";
+       $sql = "SELECT id, description, inactive FROM `".TB_PREF."groups`";
        return combo_input($name, $selected_id, $sql, 'id', 'description', array(
                'spec_option' => $special_option===true ? ' ' : $special_option,
                'order' => 'description', 'spec_id' => 0,
@@ -1290,7 +1486,6 @@ function sales_types_list($name, $selected_id=null, $submit_on_change=false, $sp
                'spec_option' => $special_option===true ? _("All Sales Types") : $special_option,
                'spec_id' => 0,
                'select_submit'=> $submit_on_change,
-       //        'async' => false,
        ) );
 }
 
@@ -1323,12 +1518,12 @@ function bank_reconciliation_list($account, $name, $selected_id=null, $submit_on
                WHERE bank_act=".db_escape($account)." AND reconciled IS NOT NULL
                GROUP BY reconciled";
        return combo_input($name, $selected_id, $sql, 'id', 'reconciled',
-       array(
-               'spec_option' => $special_option,
-               'format' => '_format_date',
-               'spec_id' => '',
-               'select_submit'=> $submit_on_change
-       ) );
+               array(
+                       'spec_option' => $special_option,
+                       'format' => '_format_date',
+                       'spec_id' => '',
+                       'select_submit'=> $submit_on_change
+               ) );
 }
 
 function bank_reconciliation_list_cells($label,$account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
@@ -1355,10 +1550,10 @@ function workcenter_list($name, $selected_id=null, $all_option=false)
        $sql = "SELECT id, name, inactive FROM ".TB_PREF."workcentres";
 
        return combo_input($name, $selected_id, $sql, 'id', 'name',
-       array(
-               'spec_option' =>$all_option===true ? _("All Suppliers") : $all_option,
-               'spec_id' => ALL_TEXT,
-       ) );
+               array(
+                       'spec_option' =>$all_option===true ? _("All Suppliers") : $all_option,
+                       'spec_id' => ALL_TEXT,
+               ) );
 }
 
 function workcenter_list_cells($label, $name, $selected_id=null, $all_option=false)
@@ -1382,17 +1577,17 @@ function workcenter_list_row($label, $name, $selected_id=null, $all_option=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
+       $sql = "SELECT id, bank_account_name, bank_curr_code, inactive
                FROM ".TB_PREF."bank_accounts";
 
        return combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
-       array(
-               'format' => '_format_add_curr',
-               'select_submit'=> $submit_on_change,
-               'spec_option' => $spec_option,
-               'spec_id' => '',
-               'async' => false
-       ) );
+               array(
+                       'format' => '_format_add_curr',
+                       'select_submit'=> $submit_on_change,
+                       'spec_option' => $spec_option,
+                       'spec_id' => '',
+                       'async' => false
+               ) );
 }
 
 function bank_accounts_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
@@ -1415,21 +1610,21 @@ 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, $all_option=false)
 {
 
-       $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive
+       $sql = "SELECT id, bank_account_name, bank_curr_code, inactive
                FROM ".TB_PREF."bank_accounts
-               WHERE ".TB_PREF."bank_accounts.account_type=".BT_CASH;
+               WHERE account_type=".BT_CASH;
 
        if ($label != null)
                echo "<tr><td class='label'>$label</td>\n";
        echo "<td>";
        echo combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
-       array(
-               'spec_option' => $all_option,
-               'spec_id' => ALL_TEXT,
-               'format' => '_format_add_curr',
-               'select_submit'=> $submit_on_change,
-               'async' => true
-       ) );
+               array(
+                       'spec_option' => $all_option,
+                       'spec_id' => ALL_TEXT,
+                       'format' => '_format_add_curr',
+                       'select_submit'=> $submit_on_change,
+                       'async' => true
+               ) );
        echo "</td></tr>\n";
 }
 //-----------------------------------------------------------------------------------------------
@@ -1445,13 +1640,13 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub
        echo "<td>";
 
        echo combo_input($name, $selected_id, $sql, 'id', 'pos_name',
-       array(
-               'select_submit'=> $submit_on_change,
-               'async' => true,
-               'spec_option' =>$spec_option,
-               'spec_id' => -1,
-               'order'=> array('pos_name')
-       ) );
+               array(
+                       'select_submit'=> $submit_on_change,
+                       'async' => true,
+                       'spec_option' =>$spec_option,
+                       'spec_id' => -1,
+                       'order'=> array('pos_name')
+               ) );
        echo "</td></tr>\n";
 
 }
@@ -1470,10 +1665,10 @@ function sale_payment_list($name, $category, $selected_id=null, $submit_on_chang
                        $sql .= " WHERE days_before_due>=0";
 
        return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms',
-       array(
-               'select_submit'=> $submit_on_change,
-               'async' => true
-       ) );
+               array(
+                       'select_submit'=> $submit_on_change,
+                       'async' => true
+               ) );
 
 }
 
@@ -1494,10 +1689,10 @@ function class_list($name, $selected_id=null, $submit_on_change=false)
        $sql = "SELECT cid, class_name FROM ".TB_PREF."chart_class";
 
        return combo_input($name, $selected_id, $sql, 'cid', 'class_name',
-       array(
-               'select_submit'=> $submit_on_change,
-               'async' => false
-       ) );
+               array(
+                       'select_submit'=> $submit_on_change,
+                       'async' => false
+               ) );
 
 }
 
@@ -1518,34 +1713,71 @@ function class_list_row($label, $name, $selected_id=null, $submit_on_change=fals
 }
 
 //-----------------------------------------------------------------------------------------------
-function stock_categories_list($name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
+function stock_categories_list($name, $selected_id=null, $spec_opt=false, $submit_on_change=false, $fixed_asset=false)
 {
+       $where_opts = array();
+       if ($fixed_asset)
+               $where_opts[0] = "dflt_mb_flag='F'";
+       else
+               $where_opts[0] = "dflt_mb_flag!='F'";
+
        $sql = "SELECT category_id, description, inactive FROM ".TB_PREF."stock_category";
        return combo_input($name, $selected_id, $sql, 'category_id', 'description',
-       array('order'=>'category_id',
-               'spec_option' => $spec_opt,
-               'spec_id' => -1,
-               'select_submit'=> $submit_on_change,
-               'async' => true
-       ));
+               array('order'=>'category_id',
+                       'spec_option' => $spec_opt,
+                       'spec_id' => -1,
+                       'select_submit'=> $submit_on_change,
+                       'async' => true,
+                       'where' => $where_opts,
+               ));
 }
 
-function stock_categories_list_cells($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
+function stock_categories_list_cells($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false, $fixed_asset=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       echo stock_categories_list($name, $selected_id, $spec_opt, $submit_on_change);
+       echo stock_categories_list($name, $selected_id, $spec_opt, $submit_on_change, $fixed_asset);
        echo "</td>\n";
 }
 
-function stock_categories_list_row($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
+function stock_categories_list_row($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false, $fixed_asset=false)
 {
        echo "<tr><td class='label'>$label</td>";
-       stock_categories_list_cells(null, $name, $selected_id, $spec_opt, $submit_on_change);
+       stock_categories_list_cells(null, $name, $selected_id, $spec_opt, $submit_on_change, $fixed_asset);
        echo "</tr>\n";
 }
 
+//-----------------------------------------------------------------------------------------------
+function fixed_asset_classes_list($name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
+{
+       $sql = "SELECT c.fa_class_id, CONCAT(c.fa_class_id,' - ',c.description) `desc`, CONCAT(p.fa_class_id,' - ',p.description) `class`, c.inactive FROM "
+               .TB_PREF."stock_fa_class c LEFT JOIN ".TB_PREF."stock_fa_class p ON c.parent_id=p.fa_class_id";
+
+       return combo_input($name, $selected_id, $sql, 'c.fa_class_id', 'desc',
+               array('order'=>'c.fa_class_id',
+                       'spec_option' => $spec_opt,
+                       'spec_id' => '-1',
+                       'select_submit'=> $submit_on_change,
+                       'async' => true,
+                       'search_box' => true,
+                       'search' => array("c.fa_class_id"),
+                   'search_submit' => false,
+                   'spec_id' => '',
+                   'size' => 3,
+                   'max' => 3,
+                       'category' => 'class',
+               ));
+}
+
+function fixed_asset_classes_list_row($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false)
+{
+       echo "<tr><td class='label'>$label</td>";
+       echo "<td>";
+       echo fixed_asset_classes_list($name, $selected_id, $spec_opt, $submit_on_change);
+       echo "</td></tr>\n";
+}
+
 //-----------------------------------------------------------------------------------------------
 
 function gl_account_types_list($name, $selected_id=null, $all_option=false, $all=true)
@@ -1554,12 +1786,12 @@ function gl_account_types_list($name, $selected_id=null, $all_option=false, $all
        $sql = "SELECT id, name FROM ".TB_PREF."chart_types";
 
        return combo_input($name, $selected_id, $sql, 'id', 'name',
-       array(
-               'format' => '_format_account',
-               'order' => array('class_id', 'id', 'parent'),
-               'spec_option' =>$all_option,
-               'spec_id' => ALL_TEXT
-       ) );
+               array(
+                       'format' => '_format_account',
+                       'order' => array('class_id', 'id', 'parent'),
+                       'spec_option' =>$all_option,
+                       'spec_id' => ALL_TEXT
+               ) );
 }
 
 function gl_account_types_list_cells($label, $name, $selected_id=null, $all_option=false, $all=false)
@@ -1581,7 +1813,7 @@ function gl_account_types_list_row($label, $name, $selected_id=null, $all_option
 
 //-----------------------------------------------------------------------------------------------
 function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=false,
-       $cells=false, $all_option=false, $submit_on_change=false, $all=false)
+       $cells=false, $all_option=false, $submit_on_change=false, $all=false, $type_id=false)
 {
        if ($skip_bank_accounts)
                $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
@@ -1594,50 +1826,50 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
                $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id
                        FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type
                        WHERE chart.account_type=type.id";
-
+       if ($type_id ) $sql .= " AND chart.account_type=".db_escape($type_id);
+       $account = ($skip_bank_accounts ? "account2" : "account");
        return combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name',
-       array(
-               'format' => '_format_account',
-               'spec_option' => $all_option===true ?  _("Use Item Sales Accounts") : $all_option,
-               'spec_id' => '',
-               'type' => 2,
-               'order' => array('type.class_id','type.id','account_code'),
-               'search_box' => $cells,
+               array(
+                       'format' => '_format_account',
+                       'spec_option' => $all_option===true ?  _("Use Item Sales Accounts") : $all_option,
+                       'spec_id' => '',
+                       'type' => 2,
+                       'order' => array('type.class_id','type.id','account_code'),
+                       'search_box' => $cells,
                        'search_submit' => false,
                        'size' => 12,
                        'max' => 10,
                        'cells' => true,
-               'select_submit'=> $submit_on_change,
-               'async' => false,
-               'category' => 2,
-               'show_inactive' => $all
-       ) );
-
+                       'select_submit'=> $submit_on_change,
+                       'async' => false,
+                       'category' => 2,
+                       'show_inactive' => $all
+               ), $account );
 }
 
 function _format_account($row)
 {
-               return $row[0] .  "&nbsp;&nbsp;&nbsp;&nbsp;" . $row[1];
+       return $row[0] .  "&nbsp;&nbsp;&nbsp;&nbsp;" . $row[1];
 }
 
 function gl_all_accounts_list_cells($label, $name, $selected_id=null, 
        $skip_bank_accounts=false, $cells=false, $all_option=false, 
-       $submit_on_change=false, $all=false)
+       $submit_on_change=false, $all=false, $type_id=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
        echo gl_all_accounts_list($name, $selected_id, 
-               $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all);
+               $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all, $type_id);
        echo "</td>\n";
 }
 
 function gl_all_accounts_list_row($label, $name, $selected_id=null, 
-       $skip_bank_accounts=false, $cells=false, $all_option=false)
+       $skip_bank_accounts=false, $cells=false, $all_option=false, $submit_on_change=false, $all=false, $type_id=false)
 {
        echo "<tr><td class='label'>$label</td>";
        gl_all_accounts_list_cells(null, $name, $selected_id, 
-               $skip_bank_accounts, $cells, $all_option);
+               $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all, $type_id);
        echo "</tr>\n";
 }
 
@@ -1901,7 +2133,7 @@ function journal_types_list_cells($label, $name, $value=null, $submit_on_change=
        echo "</td>\n";
 }
 
-function cust_allocations_list_cells($label, $name, $selected=null)
+function cust_allocations_list_cells($label, $name, $selected=null, $submit_on_change=false)
 {
 
        if ($label != null)
@@ -1910,12 +2142,12 @@ function cust_allocations_list_cells($label, $name, $selected=null)
        $allocs = array( 
                ALL_TEXT=>_("All Types"),
                '1'=> _("Sales Invoices"),
-               '2'=> _("Overdue Invoices"),
+               '2'=> _("Unsettled transactions"),
                '3' => _("Payments"),
                '4' => _("Credit Notes"),
                '5' => _("Delivery Notes")
        );
-       echo array_selector($name, $selected, $allocs);
+       echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
        echo "</td>\n";
 }
 
@@ -1935,7 +2167,7 @@ function supp_allocations_list_cell($name, $selected=null)
        echo "</td>\n";
 }
 
-function supp_transactions_list_cell($name, $selected=null)
+function supp_transactions_list_cell($name, $selected=null, $submit_on_change=false)
 {
 
        echo "<td>\n";
@@ -1943,13 +2175,13 @@ function supp_transactions_list_cell($name, $selected=null)
                ALL_TEXT=>_("All Types"),
                '6'=>_("GRNs"),
                '1'=> _("Invoices"),
-               '2'=> _("Overdue Invoices"),
+               '2'=> _("Unsettled transactions"),
                '3' => _("Payments"),
                '4' => _("Credit Notes"),
                '5' => _("Overdue Credit Notes")
        );
 
-       echo array_selector($name, $selected, $allocs);
+       echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
        echo "</td>\n";
 }
 
@@ -1977,9 +2209,9 @@ function credit_type_list_cells($label, $name, $selected=null, $submit_on_change
                label_cell($label);
        echo "<td>\n";
        echo array_selector($name, $selected, 
-                               array( 'Return' => _("Items Returned to Inventory Location"),
-                                       'WriteOff' => _("Items Written Off")),
-                               array( 'select_submit'=> $submit_on_change ) );
+                       array( 'Return' => _("Items Returned to Inventory Location"),
+                               'WriteOff' => _("Items Written Off")),
+                       array( 'select_submit'=> $submit_on_change ) );
        echo "</td>\n";
 }
 
@@ -1997,8 +2229,8 @@ function number_list($name, $selected, $from, $to, $no_option=false)
                $items[$i] = "$i";
 
        return array_selector($name, $selected, $items,
-                               array(  'spec_option' => $no_option,
-                                               'spec_id' => ALL_NUMERIC) );
+                       array(  'spec_option' => $no_option,
+                                       'spec_id' => ALL_NUMERIC) );
 }
 
 function number_list_cells($label, $name, $selected, $from, $to, $no_option=false)
@@ -2080,7 +2312,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)
+function quick_entries_list_cells($label, $name, $selected_id, $type, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
@@ -2089,7 +2321,7 @@ function quick_entries_list_cells($label, $name, $selected_id=null, $type, $subm
        echo "</td>";
 }
 
-function quick_entries_list_row($label, $name, $selected_id=null, $type, $submit_on_change=false)
+function quick_entries_list_row($label, $name, $selected_id, $type, $submit_on_change=false)
 {
        echo "<tr><td class='label'>$label</td>";
        quick_entries_list_cells(null, $name, $selected_id, $type, $submit_on_change);
@@ -2145,13 +2377,13 @@ function security_roles_list($name, $selected_id=null, $new_item=false, $submit_
 
        $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
-       ) );
+       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,
@@ -2330,7 +2562,7 @@ function payment_services($name)
 {
        global $payment_services;
 
-       $services = array_combine(array_keys($payment_services), array_keys($payment_services));
+       $services = (object)array_combine(array_keys($payment_services), array_keys($payment_services));
 
        return array_selector($name, null, $services, array(
                        'spec_option'=> _("No payment Link"),
@@ -2413,12 +2645,12 @@ function subledger_list($name, $account, $selected_id=null)
                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);
+               WHERE d.debtor_no=c.debtor_no AND NOT d.inactive AND c.receivables_account=".db_escape($account);
        else
                $sql = "SELECT supplier_id as id, supp_ref as name 
                FROM "
                .TB_PREF."suppliers s
-               WHERE s.payable_account=".db_escape($account);
+               WHERE NOT s.inactive AND s.payable_account=".db_escape($account);
 
        $mode = get_company_pref('no_customer_list');
 
@@ -2461,7 +2693,7 @@ function accounts_type_list_row($label, $name, $selected_id=null)
 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";
+       $sql = " SELECT user_id, IF(real_name = '', user_id, real_name) FROM ".TB_PREF."users";
 
     if ($label != null)
         echo "<td>$label</td>\n";