Merged changes in main branch up to v.2.1.2
[fa-stable.git] / includes / ui / ui_lists.inc
index acfe058cb56a1584d996e446f1003505c61c56e3..6362fe74a51e444bbf6b3e9a0ff7e829b091360b 100644 (file)
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/includes/banking.inc");
 include_once($path_to_root . "/includes/reserved.inc");
 include_once($path_to_root . "/includes/types.inc");
@@ -49,7 +58,9 @@ $opts = array(                // default options
        'search' => array(), // sql field names to search
        'format' => null,        // format functions for regular options
        'disabled' => false,
-       'box_hint' => null // box/selectors hints; null = std see below
+       'box_hint' => null, // box/selectors hints; null = std see below
+       'category' => false, // category column name or false
+       'show_inactive' => false // show inactive records. 
 );
 // ------ merge options with defaults ----------
        if($options != null)
@@ -121,11 +132,20 @@ $opts = array(            // default options
    }
        // sql completion
        if (count($opts['where'])) {
-               $sql .= strpos($sql, 'WHERE')==false ? ' WHERE ':' AND ';
-               $sql .= '('. implode($opts['where'], ' AND ') . ')';
+               $where = strpos($sql, 'WHERE')==false ? ' WHERE ':' AND ';
+               $where .= '('. implode($opts['where'], ' AND ') . ')';
+               $group_pos = strpos($sql, 'GROUP BY');
+               if ($group_pos) {
+                       $group = substr($sql, $group_pos);
+                       $sql = substr($sql, 0, $group_pos) . $where.' '.$group;
+               } else {
+                       $sql .= $where;
+               }
        }
        if ($opts['order'] != false) {
-               $sql .= ' ORDER BY '.$opts['order'];
+               if (!is_array($opts['order']))
+                       $opts['order'] = array($opts['order']);
+               $sql .= ' ORDER BY '.implode(',',$opts['order']);
        }
 
        $sql .= $limit;
@@ -133,7 +153,8 @@ $opts = array(              // default options
        $selector = $first_opt = '';
        $first_id = false;
        $found = false;
-//if($name=='contact_sel') display_error($sql);
+       $lastcat = null;
+//if($name=='stock_id') display_error($sql);
        if($result = db_query($sql)) {
                while ($contact_row = db_fetch($result)) {
                        $value = $contact_row[0];
@@ -147,11 +168,22 @@ $opts = array(            // default options
                                $sel = 'selected';
                                $found = $value;
                        }
+                       // show selected option even if inactive 
+                       if (!$opts['show_inactive'] && @$contact_row['inactive'] && $sel==='') {
+                               continue;
+                       } else 
+                               $optclass = @$contact_row['inactive'] ? "class='inactive'" : '';
+
                        if ($first_id === false) {
                                $first_id = $value;
                                $first_opt = $descr;
                        }
-                       $selector .= "<option $sel value='$value'>$descr</option>\n";
+                       $cat = $contact_row[$opts['category']];
+                       if ($opts['category'] !== false && $cat != $lastcat){
+                               $selector .= "<optgroup label='".$cat."'>\n";
+                               $lastcat = $cat;
+                       }
+                       $selector .= "<option $sel $optclass value='$value'>$descr</option>\n";
                }
                db_free_result($result);
        }
@@ -160,8 +192,11 @@ $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' : '';
-               $selector = "<option $sel value='$spec_id'>$spec_option</option>\n"
+               $optclass = @$contact_row['inactive'] ? "class='inactive'" : '';
+               $selector = "<option $sel value='$first_id'>$first_opt</option>\n"
                        . $selector;
        }
 
@@ -208,7 +243,7 @@ $opts = array(              // default options
                                $search_submit)."\n";
                }
        }
-       default_focus($name);
+       default_focus(($search_box && $by_id) ? $search_box : $name);
        $str = $selector;
        if ($search_box && $opts['cells'])
                echo ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector</td>";
@@ -329,11 +364,12 @@ function _format_add_curr($row)
                '' : ("&nbsp;-&nbsp;" . $row[2]));
 }
 
-function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false)
+function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
+       $all=false)
 {
        global $all_items;
 
-       $sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ";
+       $sql = "SELECT supplier_id, supp_name, curr_code, inactive FROM ".TB_PREF."suppliers ";
 
        $mode = get_company_pref('no_supplier_list');
 
@@ -348,15 +384,17 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_
                'select_submit'=> $submit_on_change,
                'async' => false,
                'sel_hint' => $mode ? _('Press Space tab to filter by name fragment') :
-               _('Select supplier')
+               _('Select supplier'),
+               'show_inactive'=>$all
                ));
 }
 
-function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, 
+       $submit_on_change=false, $all=false)
 {
        if ($label != null)
                echo "<td>$label</td><td>\n";
-       $str = supplier_list($name, $selected_id, $all_option, $submit_on_change);
+       $str = supplier_list($name, $selected_id, $all_option, $submit_on_change, $all);
                echo "</td>\n";
        return $str;
 }
@@ -370,11 +408,11 @@ return $str;
 }
 //----------------------------------------------------------------------------------------------
 
-function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false)
+function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, $show_inactive=false)
 {
        global $all_items;
 
-       $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ";
+       $sql = "SELECT debtor_no, name, curr_code, inactive FROM ".TB_PREF."debtors_master ";
 
        $mode = get_company_pref('no_customer_list');
 
@@ -390,24 +428,29 @@ return combo_input($name, $selected_id, $sql, 'debtor_no', 'name',
                'edit_submit' => true, // call editor on F4
                'async' => false,
                'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F4 - entry new customer') :
-               _('Select customer')
+               _('Select customer'),
+               'show_inactive' => $show_inactive
        ) );
 }
 
-function customer_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function customer_list_cells($label, $name, $selected_id=null, $all_option=false, 
+       $submit_on_change=false, $show_inactive=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td nowrap>";
-       $str = customer_list($name, $selected_id, $all_option, $submit_on_change);
+       $str = customer_list($name, $selected_id, $all_option, $submit_on_change,
+               $show_inactive);
        echo "</td>\n";
        return $str;
 }
 
-function customer_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false)
+function customer_list_row($label, $name, $selected_id=null, $all_option = false, 
+       $submit_on_change=false, $show_inactive=false)
 {
        echo "<tr><td>$label</td><td nowrap>";
-       $str = customer_list($name, $selected_id, $all_option, $submit_on_change);
+       $str = customer_list($name, $selected_id, $all_option, $submit_on_change,
+               $show_inactive);
        echo "</td>\n</tr>\n";
        return $str;
 }
@@ -458,7 +501,7 @@ function locations_list($name, $selected_id=null, $all_option=false, $submit_on_
 {
        global $all_items;
 
-       $sql = "SELECT loc_code, location_name FROM ".TB_PREF."locations";
+       $sql = "SELECT loc_code, location_name, inactive FROM ".TB_PREF."locations";
 
 return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name',
        array(
@@ -490,7 +533,7 @@ function locations_list_row($label, $name, $selected_id=null, $all_option=false,
 
 function currencies_list($name, $selected_id=null, $submit_on_change=false)
 {
-       $sql = "SELECT curr_abrev, currency FROM ".TB_PREF."currencies";
+       $sql = "SELECT curr_abrev, currency, inactive FROM ".TB_PREF."currencies";
 
 // default to the company currency
 
@@ -586,33 +629,34 @@ $options = array(
 }
 
 function dimensions_list_cells($label, $name, $selected_id=null, $no_option=false, $showname=null,
-       $showclosed=false, $showtype=0)
+       $showclosed=false, $showtype=0, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = dimensions_list($name, $selected_id, $no_option, $showname, false, $showclosed, $showtype);
+       $str = dimensions_list($name, $selected_id, $no_option, $showname, $submit_on_change, $showclosed, $showtype);
        echo "</td>\n";
        return $str;
 }
 
 function dimensions_list_row($label, $name, $selected_id=null, $no_option=false, $showname=null,
-       $showclosed=false, $showtype=0)
+       $showclosed=false, $showtype=0, $submit_on_change=false)
 {
        echo "<tr>\n";
        $str = dimensions_list_cells($label, $name, $selected_id, $no_option, $showname,
-               $showclosed, $showtype);
+               $showclosed, $showtype, $submit_on_change);
        echo "</tr>\n";
        return $str;
 }
 
 //---------------------------------------------------------------------------------------------------
 
-function stock_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false, $opts=array())
+function stock_items_list($name, $selected_id=null, $all_option=false, 
+       $submit_on_change=false, $opts=array())
 {
        global $all_items;
 
-       $sql = "SELECT stock_id, s.description, c.description
+       $sql = "SELECT stock_id, s.description, c.description, s.inactive
                        FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id";
 
        return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
@@ -625,22 +669,24 @@ function stock_items_list($name, $selected_id=null, $all_option=false, $submit_o
                'search' => array("stock_id", "c.description","s.description"),
                'search_submit' => get_company_pref('no_item_list')!=0,
                'size'=>10,
-               'select_submit'=> $submit_on_change
+               'select_submit'=> $submit_on_change,
+               'category' => 2,
+               'order' => array('c.description','stock_id')
          ), $opts) );
 }
 
 function _format_stock_items($row)
 {
-       return (user_show_codes() ?  ($row[0] . "&nbsp;-&nbsp;") : "")
-               . $row[2] . "&nbsp;-&nbsp;" . $row[1];
+       return (user_show_codes() ?  ($row[0] . "&nbsp;-&nbsp;") : "") . $row[1];
 }
 
-function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, 
+       $submit_on_change=false, $all=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('cells'=>true));
+               array('cells'=>true, 'show_inactive'=>$all));
        return $str;
 }
 /*
@@ -652,6 +698,74 @@ function stock_items_list_row($label, $name, $selected_id=null, $all_option=fals
        return $str;
 }
 */
+//---------------------------------------------------------------------------------------------------
+//
+// Select item via foreign code.
+//
+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
+                       FROM
+                       ".TB_PREF."item_codes i
+                       LEFT JOIN
+                       ".TB_PREF."stock_category c
+                       ON i.category_id=c.category_id";
+
+       if ($type == 'local')   { // exclude foreign codes
+               $sql .= " WHERE !i.is_foreign"; 
+       } elseif ($type == 'kits') { // sales kits
+               $sql .= " WHERE !i.is_foreign AND i.item_code!=i.stock_id";
+       }
+       $sql .= " AND !i.inactive";
+       $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_items,
+               'search_box' => true,
+               'search' => array("i.item_code", "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')
+         ), $opts) );
+}
+
+function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+{
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change,
+               '', array('cells'=>true));
+       return $str;
+}
+
+function sales_kits_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
+{
+       $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change,
+               'kits', array('cells'=>false));
+       return $str;
+}
+
+function sales_local_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
+{
+       echo "<tr>";
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+       $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change,
+               'local', array('cells'=>false));
+       echo "</td></tr>";
+       return $str;
+}
 //------------------------------------------------------------------------------------
 
 function base_stock_items_list($where, $name, $selected_id=null,
@@ -659,7 +773,7 @@ function base_stock_items_list($where, $name, $selected_id=null,
 {
        global $all_items;
 
-       $sql = "SELECT stock_id, s.description, c.description
+       $sql = "SELECT stock_id, s.description, c.description, s.inactive
                FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE
                s.category_id=c.category_id";
 
@@ -669,8 +783,8 @@ function base_stock_items_list($where, $name, $selected_id=null,
                'spec_option' => $all_option==true ?  _("All Items") : $all_option,
                'spec_id' => $all_items,
                'select_submit'=> $submit_on_change,
-               'where' => $where
-       ) );
+               'where' => $where,
+               'category' => 2 ) );
 }
 //------------------------------------------------------------------------------------
 
@@ -770,16 +884,17 @@ function stock_costable_items_list_cells($label, $name, $selected_id=null,
 
 //------------------------------------------------------------------------------------
 function stock_purchasable_items_list($name, $selected_id=null,        
-       $all_option=false, $submit_on_change=false)
+       $all_option=false, $submit_on_change=false, $all=false)
 {
        $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
                array('where'=>array("mb_flag!= 'M'"), 
-                       'edit_submit' => true));
+                       'edit_submit' => true,
+                       'show_inactive'=>$all));
        return $str;
 }
 
 function stock_purchasable_items_list_cells($label, $name, $selected_id=null,
-                       $all_option=false, $submit_on_change=false)
+                       $all_option=false, $submit_on_change=false, $all=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
@@ -804,18 +919,14 @@ function stock_purchasable_items_list_row($label, $name, $selected_id=null,
 
 function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=true)
 {
-       $types = array(
-               'M' => _("Manufactured"),
-               'B' => _("Purchased"),
-               'D' => _("Service")
-       );
+       global $stock_types;
 
        echo "<tr>";
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
 
-       array_selector($name, $selected_id, $types, 
+       array_selector($name, $selected_id, $stock_types, 
                array( 
                        'select_submit'=> true, 
                        'disabled' => !$enabled) );
@@ -887,26 +998,26 @@ function tax_groups_list($name, $selected_id=null,
        array(
                'order' => 'id',
                'spec_option' => $none_option,
-               'spec_id' => 0,
+               'spec_id' => reserved_words::get_all_numeric(),
                'select_submit'=> $submit_on_change,
                'async' => false,
        ) );
 }
 
-function tax_groups_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
+function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = tax_groups_list($name, $selected_id, false, $submit_on_change);
+       $str = tax_groups_list($name, $selected_id, $none_option, $submit_on_change);
        echo "</td>\n";
        return $str;
 }
 
-function tax_groups_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+function tax_groups_list_row($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false)
 {
        echo "<tr>\n";
-       $str = tax_groups_list_cells($label, $name, $selected_id, false, $submit_on_change);
+       $str = tax_groups_list_cells($label, $name, $selected_id, $none_option, $submit_on_change);
        echo "</tr>\n";
        return $str;
 }
@@ -939,7 +1050,7 @@ function item_tax_types_list_row($label, $name, $selected_id=null)
 
 function shippers_list($name, $selected_id=null)
 {
-       $sql = "SELECT shipper_id, shipper_name FROM ".TB_PREF."shippers";
+       $sql = "SELECT shipper_id, shipper_name, inactive FROM ".TB_PREF."shippers";
        combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', array());
 }
 
@@ -963,7 +1074,7 @@ function shippers_list_row($label, $name, $selected_id=null)
 
 function sales_persons_list($name, $selected_id=null)
 {
-       $sql = "SELECT salesman_code, salesman_name FROM ".TB_PREF."salesman";
+       $sql = "SELECT salesman_code, salesman_name, inactive FROM ".TB_PREF."salesman";
        combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', array());
 }
 
@@ -987,7 +1098,7 @@ function sales_persons_list_row($label, $name, $selected_id=null, $submit_on_cha
 
 function sales_areas_list($name, $selected_id=null)
 {
-       $sql = "SELECT area_code, description FROM ".TB_PREF."areas";
+       $sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas";
        combo_input($name, $selected_id, $sql, 'area_code', 'description', array());
 }
 
@@ -1009,6 +1120,68 @@ function sales_areas_list_row($label, $name, $selected_id=null)
 
 //------------------------------------------------------------------------------------
 
+function sales_groups_list($name, $selected_id=null, $special_option=false)
+{
+       $sql = "SELECT id, description, inactive FROM ".TB_PREF."groups";
+       combo_input($name, $selected_id, $sql, 'id', 'description', array(
+               'spec_option' => $special_option===true ? ' ' : $special_option,
+               'order' => 'description', 'spec_id' => 0,
+       ));
+}
+
+function sales_groups_list_cells($label, $name, $selected_id=null, $special_option=false)
+{
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+       sales_groups_list($name, $selected_id, $special_option);
+       echo "</td>\n";
+}
+
+function sales_groups_list_row($label, $name, $selected_id=null, $special_option=false)
+{
+       echo "<tr>\n";
+       sales_groups_list_cells($label, $name, $selected_id, $special_option);
+       echo "</tr>\n";
+}
+
+//------------------------------------------------------------------------------------
+
+function _format_template_items($row)
+{
+       return ($row[0] . "&nbsp;- &nbsp;" . _("Amount") . "&nbsp;".$row[1]);
+}
+
+function templates_list($name, $selected_id=null, $special_option=false)
+{
+       $sql = "SELECT sorder.order_no, Sum(line.unit_price*line.quantity*(1-line.discount_percent)) AS OrderValue
+               FROM ".TB_PREF."sales_orders as sorder, ".TB_PREF."sales_order_details as line
+               WHERE sorder.order_no = line.order_no AND sorder.type = 1 GROUP BY line.order_no";
+       combo_input($name, $selected_id, $sql, 'order_no', 'OrderValue', array(
+               'format' => '_format_template_items',
+               'spec_option' => $special_option===true ? ' ' : $special_option,
+               'order' => 'order_no', 'spec_id' => 0,
+       ));
+}
+
+function templates_list_cells($label, $name, $selected_id=null, $special_option=false)
+{
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+       templates_list($name, $selected_id, $special_option);
+       echo "</td>\n";
+}
+
+function templates_list_row($label, $name, $selected_id=null, $special_option=false)
+{
+       echo "<tr>\n";
+       templates_list_cells($label, $name, $selected_id, $special_option);
+       echo "</tr>\n";
+}
+
+//------------------------------------------------------------------------------------
+
 function workorders_list($name, $selected_id=null)
 {
        $sql = "SELECT id, wo_ref FROM ".TB_PREF."workorders WHERE closed=0";
@@ -1035,7 +1208,7 @@ function workorders_list_row($label, $name, $selected_id=null)
 
 function payment_terms_list($name, $selected_id=null)
 {
-       $sql = "SELECT terms_indicator, terms FROM ".TB_PREF."payment_terms";
+       $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
        combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array());
 }
 
@@ -1059,7 +1232,7 @@ function payment_terms_list_row($label, $name, $selected_id=null)
 
 function credit_status_list($name, $selected_id=null)
 {
-       $sql ="SELECT id, reason_description FROM ".TB_PREF."credit_status";
+       $sql ="SELECT id, reason_description, inactive FROM ".TB_PREF."credit_status";
        combo_input($name, $selected_id, $sql, 'id', 'reason_description', array());
 }
 
@@ -1083,7 +1256,7 @@ function credit_status_list_row($label, $name, $selected_id=null)
 
 function sales_types_list($name, $selected_id=null, $submit_on_change=false, $special_option=false)
 {
-       $sql = "SELECT id, sales_type FROM ".TB_PREF."sales_types";
+       $sql = "SELECT id, sales_type, inactive FROM ".TB_PREF."sales_types";
 
        return combo_input($name, $selected_id, $sql, 'id', 'sales_type',
        array(
@@ -1137,36 +1310,48 @@ function movement_types_list_row($label, $name, $selected_id=null)
 }
 
 //-----------------------------------------------------------------------------------------------
+function _format_date($row)
+{
+       return sql2date($row['reconciled']);
+}
 
-function bank_trans_types_list($name, $selected_id=null)
+function bank_reconciliation_list($account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
 {
-       $sql = "SELECT id, name FROM ".TB_PREF."bank_trans_types";
-       combo_input($name, $selected_id, $sql, 'id', 'name', array());
+       $sql = "SELECT reconciled, reconciled FROM ".TB_PREF."bank_trans
+               WHERE bank_act=".db_escape($account)." AND reconciled IS NOT NULL
+               GROUP BY reconciled";
+       combo_input($name, $selected_id, $sql, 'id', 'reconciled',
+       array(
+               'spec_option' => $special_option,
+               'format' => '_format_date',
+               'spec_id' => '',
+               'select_submit'=> $submit_on_change
+       ) );
 }
 
-function bank_trans_types_list_cells($label, $name, $selected_id=null)
+function bank_reconciliation_list_cells($label,$account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       bank_trans_types_list($name, $selected_id);
+       bank_reconciliation_list($account, $name, $selected_id, $submit_on_change, $special_option);
        echo "</td>\n";
 }
-
-function bank_trans_types_list_row($label, $name, $selected_id=null)
+/*
+function bank_reconciliation_list_row($label, $account, $name, $selected_id=null, $submit_on_change=false, $special_option=false)
 {
        echo "<tr>\n";
-       bank_trans_types_list_cells($label, $name, $selected_id);
+       bank_reconciliation_list_cells($label, $account, $name, $selected_id, $submit_on_change, $special_option);
        echo "</tr>\n";
 }
-
+*/
 //-----------------------------------------------------------------------------------------------
 
 function workcenter_list($name, $selected_id=null, $all_option=false)
 {
        global $all_items;
 
-       $sql = "SELECT id, name FROM ".TB_PREF."workcentres";
+       $sql = "SELECT id, name, inactive FROM ".TB_PREF."workcentres";
 
        return combo_input($name, $selected_id, $sql, 'id', 'name',
        array(
@@ -1196,11 +1381,12 @@ function workcenter_list_row($label, $name, $selected_id=null, $all_option=false
 
 function bank_accounts_list($name, $selected_id=null, $submit_on_change=false)
 {
-       $sql = "SELECT ".TB_PREF."bank_accounts.account_code, bank_account_name, bank_curr_code
-               FROM ".TB_PREF."bank_accounts, ".TB_PREF."chart_master
-               WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
+       $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive
+               FROM ".TB_PREF."bank_accounts";
+//             , ".TB_PREF."chart_master
+//             WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code";
 
-       return combo_input($name, $selected_id, $sql, 'account_code', 'bank_account_name',
+       return combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
        array(
                'format' => '_format_add_curr',
                'select_submit'=> $submit_on_change,
@@ -1225,7 +1411,60 @@ function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha
        echo "</tr>\n";
        return $str;
 }
+//-----------------------------------------------------------------------------------------------
+
+function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+       $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive
+               FROM ".TB_PREF."bank_accounts
+               WHERE ".TB_PREF."bank_accounts.account_type=3";
+
+       if ($label != null)
+               echo "<tr><td>$label</td>\n";
+       echo "<td>";
+       $str = combo_input($name, $selected_id, $sql, 'id', 'bank_account_name',
+       array(
+               'format' => '_format_add_curr',
+               'select_submit'=> $submit_on_change,
+               'async' => true
+       ) );
+       echo "</td></tr>\n";
+       return $str;
+}
+//-----------------------------------------------------------------------------------------------
+
+function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $submit_on_change=false)
+{
+       $sql = "SELECT id, pos_name, inactive FROM ".TB_PREF."sales_pos";
+
+       default_focus($name);
+       echo '<tr>';
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+
+       $str = combo_input($name, $selected_id, $sql, 'id', 'pos_name',
+       array(
+               'select_submit'=> $submit_on_change,
+               'async' => true,
+               'spec_option' =>$spec_option,
+               'spec_id' => -1,
+       ) );
+       echo "</td></tr>\n";
+
+       return $str;    
+}
+//-----------------------------------------------------------------------------------------------
 
+function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
+{
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+       $str = yesno_list($name, $selected_id, _('Cash'), _('Delayed'), $submit_on_change);
+       echo "</td>\n";
+       return $str;
+}
 //-----------------------------------------------------------------------------------------------
 
 function class_list($name, $selected_id=null, $submit_on_change=false)
@@ -1260,26 +1499,29 @@ function class_list_row($label, $name, $selected_id=null, $submit_on_change=fals
 
 //-----------------------------------------------------------------------------------------------
 
-function stock_categories_list($name, $selected_id=null)
+function stock_categories_list($name, $selected_id=null, $submit_on_change=false)
 {
-       $sql = "SELECT category_id, description FROM ".TB_PREF."stock_category";
+       $sql = "SELECT category_id, description, inactive FROM ".TB_PREF."stock_category";
        combo_input($name, $selected_id, $sql, 'category_id', 'description',
-       array('order'=>'category_id'));
+       array('order'=>'category_id',
+               'select_submit'=> $submit_on_change,
+               'async' => true
+       ));
 }
 
-function stock_categories_list_cells($label, $name, $selected_id=null)
+function stock_categories_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       stock_categories_list($name, $selected_id);
+       stock_categories_list($name, $selected_id, $submit_on_change);
        echo "</td>\n";
 }
 
-function stock_categories_list_row($label, $name, $selected_id=null)
+function stock_categories_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
        echo "<tr>\n";
-       stock_categories_list_cells($label, $name, $selected_id);
+       stock_categories_list_cells($label, $name, $selected_id, $submit_on_change);
        echo "</tr>\n";
 }
 
@@ -1320,33 +1562,35 @@ 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,
-       $show_group=false, $cells=false, $all_option=false, $submit_on_change=false)
+       $cells=false, $all_option=false, $submit_on_change=false, $all=false)
 {
        if ($skip_bank_accounts)
-               $sql = "SELECT chart.account_code, chart.account_name, type.name
+               $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive
                        FROM (".TB_PREF."chart_master chart,".TB_PREF."chart_types type) "
                        ."LEFT JOIN ".TB_PREF."bank_accounts acc "
                        ."ON chart.account_code=acc.account_code
-                               WHERE acc.account_code IS NULL
+                               WHERE acc.account_code  IS NULL
                        AND chart.account_type=type.id";
        else
-               $sql = "SELECT chart.account_code, chart.account_name, type.name
+               $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive
                        FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type
                        WHERE chart.account_type=type.id";
 
        combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name',
        array(
-               'format' => '_format_account' .  ($show_group ? '2' : ''),
+               'format' => '_format_account',
                'spec_option' => $all_option===true ?  _("Use Item Sales Accounts") : $all_option,
                'spec_id' => '',
-               'order' => 'account_code',
+               'order' => array('name','account_code'),
                'search_box' => $cells,
                        'search_submit' => false,
                        'size' => 12,
                        'max' => 10,
                        'cells' => true,
                'select_submit'=> $submit_on_change,
-               'async' => false
+               'async' => false,
+               'category' => 2,
+               'show_inactive' => $all
        ) );
 
 }
@@ -1356,27 +1600,24 @@ function _format_account($row)
                return $row[0] .  "&nbsp;&nbsp;&nbsp;&nbsp;" . $row[1];
 }
 
-function _format_account2($row)
-{
-               return $row[0] .  "&nbsp;&nbsp;&nbsp;&nbsp;" . $row[2] . "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" . $row[1];
-}
-
-function gl_all_accounts_list_cells($label, $name, $selected_id=null, $skip_bank_accounts=false,
-       $show_group=false, $cells=false, $all_option=false)
+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)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       gl_all_accounts_list($name, $selected_id, $skip_bank_accounts, $show_group, $cells, $all_option);
+       gl_all_accounts_list($name, $selected_id, 
+               $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all);
        echo "</td>\n";
 }
 
-function gl_all_accounts_list_row($label, $name, $selected_id=null, $skip_bank_accounts=false,
-       $show_group=false, $cells=false, $all_option=false)
+function gl_all_accounts_list_row($label, $name, $selected_id=null, 
+       $skip_bank_accounts=false, $cells=false, $all_option=false)
 {
        echo "<tr>\n";
-       gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts,
-               $show_group, $cells, $all_option);
+       gl_all_accounts_list_cells($label, $name, $selected_id, 
+               $skip_bank_accounts, $cells, $all_option);
        echo "</tr>\n";
 }
 
@@ -1788,5 +2029,66 @@ function printers_list($name, $selected_id=null, $spec_opt=false, $submit_on_cha
                 ));
 }
 
+//------------------------------------------------------------------------------------------------
+
+function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_change=false)
+{
+       $where = false;
+       $sql = "SELECT id, description FROM ".TB_PREF."quick_entries";
+       if ($type != null)
+               $sql .= " WHERE type=$type";
+
+       combo_input($name, $selected_id, $sql, 'id', 'description',
+               array(
+                       'spec_id' => '',
+                       'order' => 'description',
+                       'select_submit'=> $submit_on_change,
+                       'async' => false
+               ) );
+
+}
+
+function quick_entries_list_cells($label, $name, $selected_id=null, $type, $submit_on_change=false)
+{
+       echo "<td>$label</td><td>\n";
+       quick_entries_list($name, $selected_id, $type, $submit_on_change);
+       echo "</td>";
+}
+
+function quick_entries_list_row($label, $name, $selected_id=null, $type, $submit_on_change=false)
+{
+       echo "<tr>\n";
+       quick_entries_list_cells($label, $name, $selected_id, $type, $submit_on_change);
+       echo "</tr>\n";
+}
+
+
+function quick_actions_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+       global $quick_actions;
+       
+       echo "<tr><td>$label</td><td>";
+       array_selector($name, $selected_id, $quick_actions, 
+               array( 
+                       'select_submit'=> $submit_on_change
+               ) );
+       echo "</td></tr>\n";
+}
+
+function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+       global $quick_entry_types;
+               
+       echo "<tr><td>$label</td><td>";
+       array_selector($name, $selected_id, $quick_entry_types, 
+               array( 
+                       'select_submit'=> $submit_on_change
+                       ) );
+       echo "</td></tr>\n";
+}
+
+function record_status_list_row($label, $name) {
+       return yesno_list_row($label, $name, null,      _('Inactive'), _('Active'));
+}
 
 ?>
\ No newline at end of file