Merged changes form main trunk since 2.1RC

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

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index a44a115eafd7826f325196f52e583b82542d9692..3f74ce292cd782d778d3ed76073e32bf40ce856b 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -233,7 +233,7 @@ $opts = array(              // default options
                                $search_submit)."\n";
                }
        }
-       default_focus($name);
+       default_focus($search_box ? $search_box : $name);
        $str = $selector;
        if ($search_box && $opts['cells'])
                echo ($edit_entry!='' ? "<td>$edit_entry</td>" : '')."<td>$selector</td>";
@@ -709,7 +709,7 @@ function sales_items_list($name, $selected_id=null, $all_option=false,
                'spec_option' => $all_option===true ?  _("All Items") : $all_option,
                'spec_id' => $all_items,
                'search_box' => true,
-               'search' => array("i.item_code", "c.description"),
+               'search' => array("i.item_code", "i.description"),
                'search_submit' => get_company_pref('no_item_list')!=0,
                'size'=>15,
                'select_submit'=> $submit_on_change,