[0000160] Customer payments in different currencies (bank account exchange error...

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

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index d7e2c964c511b3f16abdfc793ce33ff5c7683c15..3c16809af728bca9a21dd621dc97cf80707cb5de 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -748,58 +748,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
-               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'",
-               $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,
@@ -808,8 +763,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;
 }
@@ -818,15 +772,7 @@ function stock_manufactured_items_list_row($label, $name, $selected_id=null,
                $all_option=false, $submit_on_change=false)
 {
        echo "<tr>\n";
-       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";
+       $str = stock_manufactured_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change);
        echo "</tr>\n";
        return $str;
 }
@@ -934,10 +880,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";
 }