Changed balance_sheet field in account class to ctype and fixed class editing.

[fa-stable.git] / includes / ui / ui_lists.inc

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 8f10f156f5913bc79bb114506afa9835cb946a2e..bd411303ce3f9571ef0443882ec2f160a532f4c9 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -243,7 +243,7 @@ $opts = array(              // default options
                                $search_submit)."\n";
                }
        }
-       default_focus($search_box ? $search_box : $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>";
@@ -307,7 +307,7 @@ $opts = array(              // default options
 //if($name=='SelectStockFromList') display_error($sql);
                foreach($items as $value=>$descr) {
                        $sel = '';
-                       if ($selected_id == $value) {
+                       if ((string)$selected_id === (string)$value) {
                                $sel = 'selected';
                                $found = $value;
                        }
@@ -328,8 +328,9 @@ $opts = array(              // default options
        }
 
        if ($found === false) {
-               $_POST[$name] = $first_id;
+               $selected_id = $first_id;
        }
+       $_POST[$name] = $selected_id;
 
        $aspect = $opts['edit_submit'] ? " aspect='editable'" : '';
        $selector = "<select $disabled name='$name' class='combo' title='"
@@ -620,7 +621,7 @@ $options = array(
        'async' => false,
        );
 
-       if ($showclosed)
+       if (!$showclosed)
                $options['where'][] = "closed=0";
        if($showtype)
                $options['where'][] = "type_=$showtype";
@@ -710,17 +711,20 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
        $sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit,
                         i.inactive
                        FROM
+                       ".TB_PREF."stock_master s,
                        ".TB_PREF."item_codes i
                        LEFT JOIN
                        ".TB_PREF."stock_category c
-                       ON i.category_id=c.category_id";
+                       ON i.category_id=c.category_id
+                       WHERE i.stock_id=s.stock_id";
 
+       
        if ($type == 'local')   { // exclude foreign codes
-               $sql .= " WHERE !i.is_foreign"; 
+               $sql .= " AND !i.is_foreign"; 
        } elseif ($type == 'kits') { // sales kits
-               $sql .= " WHERE !i.is_foreign AND i.item_code!=i.stock_id";
+               $sql .= " AND !i.is_foreign AND i.item_code!=i.stock_id";
        }
-       $sql .= " AND !i.inactive";
+       $sql .= " AND !i.inactive AND !s.inactive AND !s.no_sale";
        $sql .= " GROUP BY i.item_code";
 
        return combo_input($name, $selected_id, $sql, 'i.item_code', 'c.description',
@@ -768,58 +772,13 @@ function sales_local_items_list_row($label, $name, $selected_id=null, $all_optio
 }
 //------------------------------------------------------------------------------------
 
-function base_stock_items_list($where, $name, $selected_id=null,
-       $all_option=false, $submit_on_change=false)
-{
-       global $all_items;
-
-       $sql = "SELECT stock_id, s.description, c.description, s.inactive
-               FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE
-               s.category_id=c.category_id";
-
-       return combo_input($name, $selected_id, $sql, 'stock_id', 's.description',
-       array(
-               'format' => '_format_stock_items',
-               'spec_option' => $all_option==true ?  _("All Items") : $all_option,
-               'spec_id' => $all_items,
-               'select_submit'=> $submit_on_change,
-               'where' => $where,
-               'category' => 2 ) );
-}
-//------------------------------------------------------------------------------------
-
-function stock_bom_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false)
-{
-
-       return base_stock_items_list("(s.mb_flag='M' OR s.mb_flag='K')",
-               $name, $selected_id, $all_option, $submit_on_change);
-}
-/*
-function stock_bom_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
-{
-       if ($label != null)
-               echo "<td>$label</td>\n";
-       echo "<td>";
-       $str = stock_bom_items_list($name, $selected_id, $all_option, $submit_on_change);
-       echo "</td>\n";
-       return $str;
-}
-
-function stock_bom_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false)
-{
-       echo "<tr>\n";
-       $str = stock_bom_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
-       echo "</tr>\n";
-       return $str;
-}
-*/
-//------------------------------------------------------------------------------------
-
 function stock_manufactured_items_list($name, $selected_id=null,
        $all_option=false, $submit_on_change=false)
 {
-       return base_stock_items_list("s.mb_flag='M'",
-               $name, $selected_id, $all_option, $submit_on_change);
+       $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array('where'=>array("mb_flag= 'M'"), 
+                       'edit_submit' => true));
+       return $str;            
 }
 
 function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
@@ -828,8 +787,7 @@ function stock_manufactured_items_list_cells($label, $name, $selected_id=null,
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = stock_manufactured_items_list($name, $selected_id, $all_option,
-                               $submit_on_change);
+       $str = stock_manufactured_items_list($name, $selected_id, $all_option, $submit_on_change);
        echo "</td>\n";
        return $str;
 }
@@ -838,8 +796,7 @@ function stock_manufactured_items_list_row($label, $name, $selected_id=null,
                $all_option=false, $submit_on_change=false)
 {
        echo "<tr>\n";
-       $str = stock_manufactured_items_list_cells($label, $name, $selected_id,
-                       $all_option, $submit_on_change);
+       $str = stock_manufactured_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
        echo "</tr>\n";
        return $str;
 }
@@ -944,10 +901,7 @@ function stock_units_list_row($label, $name, $value=null, $enabled=true)
        while($unit = db_fetch($result))
                $units[$unit['abbr']] = $unit['name'];
 
-       array_selector($name, $value, $units, 
-               array( 
-                       'select_submit'=> true, 
-                       'disabled' => !$enabled) );
+       array_selector($name, $value, $units, array( 'disabled' => !$enabled) );
 
        echo "</td></tr>\n";
 }
@@ -1624,8 +1578,8 @@ function gl_all_accounts_list_row($label, $name, $selected_id=null,
 function yesno_list($name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false)
 {
        $items = array();
-       $items['1'] = strlen($name_yes) ? $name_yes : _("Yes");
        $items['0'] = strlen($name_no) ? $name_no : _("No");
+       $items['1'] = strlen($name_yes) ? $name_yes : _("Yes");
 
        return array_selector($name, $selected_id, $items, 
                array( 
@@ -1721,7 +1675,8 @@ function payment_person_types_list($name, $selected_id=null, $submit_on_change=f
        {
                if (payment_person_types::has_items($type['id']))
                {
-                       $items[$type['id']] = $type['name'];
+                       if ($type['id'] != payment_person_types::WorkOrder())
+                               $items[$type['id']] = $type['name'];
                }
        }
        
@@ -1872,6 +1827,32 @@ function systypes_list_cells($label, $name, $value=null, $submit_on_change=false
        return $str;
 }
 
+function journal_types_list_cells($label, $name, $value=null, $submit_on_change=false)
+{
+       global $systypes_array;
+
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+
+       $items = array();
+       foreach ($systypes_array as $key=>$type)
+               // exclude orders and dimensions
+               if (!in_array($key, array(18,26,30,40)))
+                       $items[$key] = $type['name'];
+       
+       $str = array_selector($name, $value, $items, 
+               array( 
+                       'spec_option'=> _("All"),
+                       'spec_id' => -1,
+                       'select_submit'=> $submit_on_change,
+                       'async' => false
+                       )
+       );
+       echo "</td>\n";
+       return $str;
+}
+
 function systypes_list_row($label, $name, $value=null, $submit_on_change=false)
 {
        echo "<tr>\n";
@@ -2091,4 +2072,17 @@ function record_status_list_row($label, $name) {
        return yesno_list_row($label, $name, null,      _('Inactive'), _('Active'));
 }
 
+function class_types_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+       global $class_types;
+       
+       echo "<tr><td>$label</td><td>";
+       array_selector($name, $selected_id, $class_types, 
+               array( 
+                       'select_submit'=> $submit_on_change
+               ) );
+       echo "</td></tr>\n";
+}
+
+
 ?>
\ No newline at end of file