Bug in /includes/ui/ui_lists.inc:914. Sql clause was cut.

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

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 7c31bd692e85b2b804979a41f8723ab17bb103a0..178a48dbdbfb5800e0280babadd695e1dd112722 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -3,7 +3,7 @@
 include_once($path_to_root . "/includes/banking.inc");
 
 define("DEFVAL", "--");
-$search_button = "<input type='submit' class='inputsubmit' style='border:0;background:url($path_to_root/themes/default/images/locate.png) no-repeat;' name='%s' value='?' title='"._("Search")."'> ";
+$search_button = "<input type='submit' class='combo_submit' style='border:0;background:url($path_to_root/themes/default/images/locate.png) no-repeat;' name='%s' value='?' title='"._("Search")."'> ";
 //$search_button = "<input type='submit' class='inputsubmit' name='%s' value='?'> ";
 
 $all_items = reserved_words::get_all();
@@ -18,7 +18,7 @@ function supplier_list($name, $selected_id, $all_option=false, $submit_on_change
        default_focus($name);
        if ($selected_id == null)
                $selected_id = ((!isset($_POST[$name]) || $_POST[$name] == "") ? "" : $_POST[$name]);
-       
+
 
        $supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ";
        if (get_company_pref('no_supplier_list'))
@@ -604,7 +604,7 @@ function stock_items_list($name, $selected_id, $all_option=false, $submit_on_cha
        default_focus($name);
        if ($selected_id == null)
                $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       
+
 
        $sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
                        FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id";
@@ -888,7 +888,7 @@ function stock_purchasable_items_list($name, &$selected_id, $all_option=false, $
        default_focus($name);
        if ($selected_id == null)
                $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       
+
        $sql = "SELECT stock_id, ".TB_PREF."stock_master.description, ".TB_PREF."stock_category.description
                                FROM ".TB_PREF."stock_master,".TB_PREF."stock_category WHERE ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
                                AND mb_flag !='M' ";
@@ -911,7 +911,7 @@ function stock_purchasable_items_list($name, &$selected_id, $all_option=false, $
                }
                elseif ($val != "" && $val != DEFVAL)
                {
-                       $sql = "AND
+                       $sql .= "AND
                                (stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
                                .TB_PREF."stock_master.description LIKE '%{$val}%')";
                }
@@ -1574,12 +1574,12 @@ function gl_account_types_list_row($label, $name, $selected_id, $all_option=fals
 //-----------------------------------------------------------------------------------------------
 
 function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false,
-       $show_group=false, $onchange="")
+       $show_group=false, $params="")
 {
        default_focus($name);
        echo "<select name='$name'";
-       if ($onchange != "")
-               echo " onchange='$onchange'";
+       if ($params != "")
+               echo " $params";
        echo ">";
 
        if ($skip_bank_accounts)
@@ -1626,21 +1626,21 @@ function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false,
 }
 
 function gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts=false,
-       $show_group=false, $onchange="")
+       $show_group=false, $params="")
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       gl_all_accounts_list($name, $selected_id, $skip_bank_accounts, $show_group, $onchange);
+       gl_all_accounts_list($name, $selected_id, $skip_bank_accounts, $show_group, $params);
        echo "</td>\n";
 }
 
 function gl_all_accounts_list_row($label, $name, $selected_id, $skip_bank_accounts=false,
-       $show_group=false, $onchange="")
+       $show_group=false, $params="")
 {
        echo "<tr>\n";
        gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts,
-               $show_group, $onchange);
+               $show_group, $params);
        echo "</tr>\n";
 }