Added Item Code Entry in Work Order Entry and quantity decimals now follows the item

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

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 293df26e7d5a6cf2715ae11e3b9df5bd5915b8fe..d7e2c964c511b3f16abdfc793ce33ff5c7683c15 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -297,7 +297,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;
                        }
@@ -318,8 +318,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='"
@@ -770,7 +771,7 @@ function base_stock_items_list($where, $name, $selected_id=null,
 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')",
+       return base_stock_items_list("s.mb_flag='M'",
                $name, $selected_id, $all_option, $submit_on_change);
 }
 /*
@@ -817,8 +818,15 @@ 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);
+       if ($label != null)
+               echo "<td>$label</td>\n";
+       echo "<td>";
+       $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
+               array('where'=>array("mb_flag = 'M'"), 
+                       'edit_submit' => true));
+       //$str = stock_manufactured_items_list_cells($label, $name, $selected_id,
+       //              $all_option, $submit_on_change);
+       echo "</td>\n";
        echo "</tr>\n";
        return $str;
 }
@@ -1601,8 +1609,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( 
@@ -1698,7 +1706,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'];
                }
        }
        
@@ -2065,4 +2074,17 @@ function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on
 }
 
 
+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