Hiding search button in combo selectors for javascript enabled browsers.
[fa-stable.git] / includes / ui / ui_lists.inc
index a29dda765317e30b0fa476cd15a35a50a620e728..f965991155997ef2032a1e8d4894dcfeeb1fb77e 100644 (file)
@@ -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();
@@ -13,12 +13,15 @@ $all_items = reserved_words::get_all();
 
 function supplier_list($name, $selected_id, $all_option=false, $submit_on_change=false)
 {
-       global $no_supplier_list, $all_items;
+       global $all_items;
 
+       default_focus($name);
        if ($selected_id == null)
                $selected_id = ((!isset($_POST[$name]) || $_POST[$name] == "") ? "" : $_POST[$name]);
+       
 
-       if ($no_supplier_list)
+       $supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ";
+       if (get_company_pref('no_supplier_list'))
        {
                global $search_button;
                $edit_name = $name."_edit";
@@ -28,34 +31,25 @@ function supplier_list($name, $selected_id, $all_option=false, $submit_on_change
                if (isset($_POST[$edit_button]))
                {
                        $selected_id = $_POST[$name] = "";
+                       set_focus($name);
                }
 
                if ($selected_id != "")
                {
                        $val = DEFVAL;
-                       $supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers WHERE supplier_id=$selected_id";
-                       $supplier_result = db_query($supplier_sql);
+                       $supplier_sql .= "WHERE supplier_id=$selected_id";
                }
-               else
+               elseif ($val != "" && $val != DEFVAL)
                {
-                       if ($val != "" && $val != DEFVAL)
-                       {
-                               $supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers WHERE supp_name LIKE '%{$val}%' ORDER BY supp_name";
-                               $supplier_result = db_query($supplier_sql);
-                       }
-                       else
-                               $supplier_result = false;
+                       $supplier_sql .= "WHERE supp_name LIKE '%{$val}%'";
                }
 
                echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
 
                echo sprintf($search_button, $edit_button);
        }
-       else
-       {
-               $supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ORDER BY supp_name";
-               $supplier_result = db_query($supplier_sql);
-       }
+
+       $supplier_result = db_query($supplier_sql." ORDER BY supp_name");
 
        if ($submit_on_change==true)
                echo "<select name='$name' onchange='this.form.submit();'>";
@@ -127,12 +121,14 @@ function supplier_list_row($label, $name, $selected_id, $all_option=false, $subm
 
 function customer_list($name, $selected_id, $all_option=false, $submit_on_change=false)
 {
-       global $no_customer_list, $all_items;
+       global $all_items;
 
+       default_focus($name);
        if ($selected_id == null)
                $selected_id = ((!isset($_POST[$name]) || $_POST[$name] == "") ? "" : $_POST[$name]);
 
-       if ($no_customer_list)
+       $customer_sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ";
+       if (get_company_pref('no_customer_list'))
        {
                global $search_button;
                $edit_name = $name."_edit";
@@ -143,34 +139,25 @@ function customer_list($name, $selected_id, $all_option=false, $submit_on_change
                {
                        $selected_id = $_POST[$name] = "";
                        $_POST['branch_id'] = "";
+                       set_focus($name);
                }
-
                if ($selected_id != "")
                {
                        $val = DEFVAL;
-                       $customer_sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master WHERE debtor_no=$selected_id";
-                       $customer_result = db_query($customer_sql);
+                       $customer_sql .= "WHERE debtor_no=$selected_id";
                }
-               else
-               {
-                       if ($val != "" && $val != DEFVAL)
+               elseif ($val != "" && $val != DEFVAL)
                        {
-                               $customer_sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master WHERE name LIKE '%{$val}%' ORDER BY name";
-                               $customer_result = db_query($customer_sql);
+                               $customer_sql .= "WHERE name LIKE '%{$val}%'";
                        }
-                       else
-                               $customer_result = false;
-               }
-
                echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
 
                echo sprintf($search_button, $edit_button);
        }
-       else
-       {
-               $customer_sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ORDER BY name";
-               $customer_result = db_query($customer_sql);
-       }
+
+
+       $customer_result = db_query($customer_sql." ORDER BY name");
+
        if ($submit_on_change==true)
                echo "<select name='$name' onchange='this.form.submit();'>";
        else
@@ -245,6 +232,7 @@ function customer_branches_list($customer_id, $name, $selected_id,
 {
        global $all_items;
 
+       default_focus($name);
        if ($submit_on_change==true)
                echo "<select name='$name' onchange='this.form.submit();'>";
        else
@@ -316,6 +304,7 @@ function locations_list($name, $selected_id, $all_option=false, $submit_on_chang
 {
        global $all_items;
 
+       default_focus($name);
        if ($submit_on_change == true)
                echo "<select name='$name' onchange='this.form.submit();'>";
        else
@@ -387,6 +376,7 @@ function locations_list_row($label, $name, $selected_id, $all_option=false, $sub
 
 function currencies_list($name, &$selected_id, $submit_on_change=false)
 {
+       default_focus($name);
        if ($submit_on_change==true)
                echo "<select name='$name' onchange='this.form.submit();'>";
        else
@@ -443,6 +433,7 @@ function currencies_list_row($label, $name, $selected_id)
 
 function fiscalyears_list($name, &$selected_id, $submit_on_change=false)
 {
+       default_focus($name);
        if ($submit_on_change == true)
                echo "<select name='$name' onchange='this.form.submit();'>";
        else
@@ -509,6 +500,7 @@ function simple_codeandname_list($sql, $name, &$selected_id,
 {
        global $all_items;
 
+       default_focus($name);
        if ($submit_on_change == true)
                echo "<select name='$name' onchange='this.form.submit();'>";
        else
@@ -567,6 +559,7 @@ function simple_codeandname_list($sql, $name, &$selected_id,
 function dimensions_list($name, &$selected_id, $no_option=false, $showname=null,
        $submit_on_change=false, $showclosed=false, $showtype=1)
 {
+       default_focus($name);
        $sql = "SELECT id, CONCAT(reference,'  ',name) FROM ".TB_PREF."dimensions";
        if ($showclosed || $showtype)
        {
@@ -606,12 +599,17 @@ function dimensions_list_row($label, $name, $selected_id, $no_option=false, $sho
 
 function stock_items_list($name, $selected_id, $all_option=false, $submit_on_change=false, $extra="")
 {
-       global $all_items, $no_item_list;
+       global $all_items;
 
+       default_focus($name);
        if ($selected_id == null)
                $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
+       
 
-       if ($no_item_list)
+       $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";
+
+       if (get_company_pref('no_item_list'))
        {
                global $search_button;
                $edit_name = $name."_edit";
@@ -622,41 +620,26 @@ function stock_items_list($name, $selected_id, $all_option=false, $submit_on_cha
                if (isset($_POST[$edit_button]))
                {
                        $selected_id = $_POST[$name] = "";
+                       set_focus($name);
                }
-
                if ($selected_id != "")
                {
                        $val = DEFVAL;
-                       $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 stock_id='$selected_id'";
-                       $result = db_query($sql);
+                       $sql .= " AND stock_id='$selected_id'";
                }
-               else
+               elseif ($val != "" && $val != DEFVAL)
                {
-                       if ($val != "" && $val != DEFVAL)
-                       {
-                               $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
+                               $sql .= " AND
                                        (stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
                                        .TB_PREF."stock_master.description LIKE '%{$val}%')";
-                               $result = db_query($sql);
-                       }
-                       else
-                               $result = false;
                }
 
                echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
 
                echo sprintf($search_button, $edit_button);
        }
-       else
-       {
-               $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";
-               $result = db_query($sql);
-       }
+       $result = db_query($sql);
+
 
        if ($submit_on_change==true)
                echo "<select name='$name' onchange='this.form.submit();'>";
@@ -727,6 +710,7 @@ function stock_bom_items_list($name, $selected_id, $all_option=false, $submit_on
 {
        global $all_items;
 
+       default_focus($name);
        if ($submit_on_change==true)
                echo "<select name='$name' onchange='this.form.submit();'>";
        else
@@ -801,6 +785,7 @@ function base_stock_items_list($sql, $name, &$selected_id,
 {
        global $all_items;
 
+       default_focus($name);
        if ($submit_on_change==true)
                echo "<select name='$name' onchange='this.form.submit();'>";
        else if ($extra != "")
@@ -898,14 +883,17 @@ function stock_component_items_list($name, $parent_stock_id, &$selected_id,
 
 function stock_purchasable_items_list($name, &$selected_id,    $all_option=false, $submit_on_change=false, $extra="")
 {
-       global $no_item_list, $all_items;
+       global $all_items;
 
+       default_focus($name);
        if ($selected_id == null)
                $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-
-       if ($no_item_list)
+       
+       $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' ";
+       if (get_company_pref('no_item_list'))
        {
-               global $search_button;
                $edit_name = $name."_edit";
                $edit_button = $name."_button";
 
@@ -913,43 +901,28 @@ function stock_purchasable_items_list($name, &$selected_id,       $all_option=false, $
                if (isset($_POST[$edit_button]))
                {
                        $selected_id = $_POST[$name] = "";
+                       set_focus($name);
                }
 
                if ($selected_id != "")
                {
                        $val = DEFVAL;
-                       $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' AND stock_id='$selected_id'";
-                       $result = db_query($sql);
+                       $sql .= "AND stock_id='$selected_id'";
                }
-               else
+               elseif ($val != "" && $val != DEFVAL)
                {
-                       if ($val != "" && $val != DEFVAL)
-                       {
-                               $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' AND
-                                       (stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
-                                       .TB_PREF."stock_master.description LIKE '%{$val}%')";
-                               $result = db_query($sql);
-                       }
-                       else
-                               $result = false;
+                       $sql = "AND
+                               (stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR "
+                               .TB_PREF."stock_master.description LIKE '%{$val}%')";
                }
 
-               echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' onblur='this.form.$edit_button.click();'> ";
+               echo "<input type='text' name='$edit_name' size='8' maxlength='50' value='$val' > ";
 
-               echo sprintf($search_button, $edit_button);
-       }
-       else
-       {
-               $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'";
-               $result = db_query($sql);
+               echo "<input type='submit' class='inputsubmit' name='$edit_button' value='?'> ";
        }
 
+       $result = db_query($sql);
+
        if ($submit_on_change==true)
                echo "<select name='$name' onchange='this.form.submit();'>";
        else if ($extra != "")
@@ -1029,6 +1002,7 @@ function stock_costable_items_list($name, &$selected_id,
 
 function stock_item_types_list_row($label, $name, $selected_id, $enabled=true)
 {
+       default_focus($name);
        echo "<tr>";
        if ($label != NULL)
                echo "<td>$label</td>\n";
@@ -1051,6 +1025,8 @@ function stock_units_list_row($label, $name, $value, $enabled=true)
 {
        global $stock_units;
 
+       default_focus($name);
+       $result = get_all_item_units();
        echo "<tr><td>$label</td>\n";
        if ($enabled)
                echo "<td><select name='$name'>";
@@ -1059,17 +1035,20 @@ function stock_units_list_row($label, $name, $value, $enabled=true)
 
        if ($value == null)
                $value = (!isset($_POST[$name]) ? "" : $_POST[$name]);
-       foreach ($stock_units as $unit)
+
+       while($unit = db_fetch($result))
        {
-               if ($value == "")
-                       $_POST[$name] = $value = $unit;
-               if ($value==$unit)
+               if ($value == "") {
+                       $_POST[$name] = $unit['abbr'];
+               }
+               $descr = $unit['name'];
+               if ($value==$unit['abbr'])
                {
-                       echo "<option selected value='$unit'>$unit</option>\n";
+                       echo "<option selected value='".$unit['abbr']."'>$descr</option>\n";
                }
                else
                {
-                       echo "<option value='$unit'>$unit</option>\n";
+                       echo "<option value='".$unit['abbr']."'>$descr</option>\n";
                }
        }
        echo "</select></td></tr>\n";
@@ -1080,7 +1059,7 @@ function stock_units_list_row($label, $name, $value, $enabled=true)
 function tax_types_list($name, $selected_id,
        $none_option=false, $none_option_name=null, $submit_on_change=false)
 {
-       simple_codeandname_list("SELECT id, name FROM ".TB_PREF."tax_types",
+       simple_codeandname_list("SELECT id, CONCAT(name, ' (',rate,'%)') as name FROM ".TB_PREF."tax_types",
                $name, $selected_id, $none_option, $none_option_name, true, $submit_on_change);
 }
 
@@ -1192,10 +1171,10 @@ function sales_persons_list_cells($label, $name, $selected_id)
        echo "</td>\n";
 }
 
-function sales_persons_list_row($label, $name, $selected_id)
+function sales_persons_list_row($label, $name, $selected_id, $submit_on_change=false)
 {
        echo "<tr>\n";
-       sales_persons_list_cells($label, $name, $selected_id);
+       sales_persons_list_cells($label, $name, $selected_id, $submit_on_change=false);
        echo "</tr>\n";
 }
 
@@ -1297,25 +1276,25 @@ function credit_status_list_row($label, $name, $selected_id)
 
 //-----------------------------------------------------------------------------------------------
 
-function sales_types_list($name, $selected_id)
+function sales_types_list($name, $selected_id, $submit_on_change=false)
 {
        simple_codeandname_list("SELECT id, sales_type FROM ".TB_PREF."sales_types",
-               $name, $selected_id);
+               $name, $selected_id, false, null, false, $submit_on_change);
 }
 
-function sales_types_list_cells($label, $name, $selected_id)
+function sales_types_list_cells($label, $name, $selected_id, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       sales_types_list($name, $selected_id);
+       sales_types_list($name, $selected_id, $submit_on_change);
        echo "</td>\n";
 }
 
-function sales_types_list_row($label, $name, $selected_id)
+function sales_types_list_row($label, $name, $selected_id, $submit_on_change=false)
 {
        echo "<tr>\n";
-       sales_types_list_cells($label, $name, $selected_id);
+       sales_types_list_cells($label, $name, $selected_id, $submit_on_change);
        echo "</tr>\n";
 }
 
@@ -1372,6 +1351,8 @@ function bank_trans_types_list_row($label, $name, $selected_id)
 function workcenter_list($name, $selected_id, $all_option=false)
 {
        global $all_items;
+
+       default_focus($name);
        echo "<select name='$name'>";
 
        $sql = "SELECT id, name FROM ".TB_PREF."workcentres";
@@ -1410,6 +1391,7 @@ function workcenter_list($name, $selected_id, $all_option=false)
 
 function workcenter_list_cells($label, $name, $selected_id, $all_option=false)
 {
+       default_focus($name);
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
@@ -1428,6 +1410,7 @@ function workcenter_list_row($label, $name, $selected_id, $all_option=false)
 
 function bank_accounts_list($name, $selected_id, $submit_on_change=false)
 {
+       default_focus($name);
        if ($submit_on_change==true)
                echo "<select name='$name' onchange='this.form.submit();'>";
        else
@@ -1487,6 +1470,7 @@ function bank_accounts_list_row($label, $name, $selected_id, $submit_on_change=f
 
 function class_list($name, $selected_id, $submit_on_change=false)
 {
+       default_focus($name);
        if ($submit_on_change==true)
                echo "<select name='$name' onchange='this.form.submit();'>";
        else
@@ -1590,11 +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)
@@ -1641,26 +1626,27 @@ 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";
 }
 
 function yesno_list($name, $selected_id, $name_yes="", $name_no="", $submit_on_change=false)
 {
+       default_focus($name);
        if ($submit_on_change == true)
                echo "<select name='$name' onchange='this.form.submit();'>";
        else
@@ -1718,6 +1704,7 @@ function languages_list($name, &$selected_id)
 {
        global $installed_languages;
 
+       default_focus($name);
        echo "<select name='$name'>";
 
        if ($selected_id == null)
@@ -1753,6 +1740,7 @@ function bank_account_types_list($name, &$selected_id)
 {
        $bank_account_types = bank_account_types::get_all();
 
+       default_focus($name);
        echo "<select name='$name'>";
 
        if ($selected_id == null)
@@ -1788,6 +1776,7 @@ function payment_person_types_list($name, $selected_id, $related=null)
 {
        $types = payment_person_types::get_all();
 
+       default_focus($name);
        echo "<select name='$name'";
        if ($related)
                echo " onchange='this.form.$related.value=\"\"; this.form.submit();' ";
@@ -1831,6 +1820,7 @@ function wo_types_list($name, &$selected_id)
 {
        $types = wo_types::get_all();
 
+       default_focus($name);
        echo "<select name='$name' onchange='this.form.submit();'>";
 
        if ($selected_id == null)
@@ -1858,6 +1848,7 @@ function dateformats_list_row($label, $name, $value)
 {
        global $dateformats;
 
+       default_focus($name);
        echo "<tr><td>$label</td>\n";
        echo "<td><select name='$name'>";
 
@@ -1884,6 +1875,7 @@ function dateseps_list_row($label, $name, $value)
 {
        global $dateseps;
 
+       default_focus($name);
        echo "<tr><td>$label</td>\n";
        echo "<td><select name='$name'>";
 
@@ -1910,6 +1902,7 @@ function thoseps_list_row($label, $name, $value)
 {
        global $thoseps;
 
+       default_focus($name);
        echo "<tr><td>$label</td>\n";
        echo "<td><select name='$name'>";
 
@@ -1936,6 +1929,7 @@ function decseps_list_row($label, $name, $value)
 {
        global $decseps;
 
+       default_focus($name);
        echo "<tr><td>$label</td>\n";
        echo "<td><select name='$name'>";
 
@@ -1960,8 +1954,18 @@ function decseps_list_row($label, $name, $value)
 
 function themes_list_row($label, $name, $value)
 {
-       global $themes;
+       global $path_to_root;
 
+       default_focus($name);
+       $path = $path_to_root.'/themes/';
+       $themes = array();
+       $themedir = opendir($path);
+       while(false !== ($fname = readdir($themedir))) {
+           if($fname!='.' && $fname!='..' && $fname!='CVS' && is_dir($path.$fname)) {
+                       $themes[] =  $fname;
+           }
+       }
+       sort($themes);
        echo "<tr><td>$label</td>\n";
        echo "<td><select name='$name'>";
 
@@ -1986,6 +1990,7 @@ function pagesizes_list_row($label, $name, $value)
 {
        global $pagesizes;
 
+       default_focus($name);
        echo "<tr><td>$label</td>\n";
        echo "<td><select name='$name'>";
 
@@ -2010,6 +2015,7 @@ function security_headings_list_row($label, $name, $value)
 {
        global $security_headings;
 
+       default_focus($name);
        echo "<tr><td>$label</td>\n";
        echo "<td><select name='$name'>";
 
@@ -2036,6 +2042,7 @@ function systypes_list_cells($label, $name, $value, $submit_on_change=false)
 {
        global $systypes_array;
 
+       default_focus($name);
        if ($label != null)
                echo "<td>$label</td>\n";
     echo "<td><select name='$name'";
@@ -2070,6 +2077,7 @@ function systypes_list_row($label, $name, $value, $submit_on_change=false)
 function cust_allocations_list_cells($label, $name, $selected)
 {
        global $all_items;
+       default_focus($name);
        if ($label != null)
                label_cell($label);
        if ($selected == null)
@@ -2080,12 +2088,15 @@ function cust_allocations_list_cells($label, $name, $selected)
        echo "<option " . ($selected == '2'?" selected ":"") . " value='2'>" . _("Overdue Invoices"). "</option>\n";
        echo "<option " . ($selected == '3'?" selected ":"") . " value='3'>" . _("Payments"). "</option>\n";
        echo "<option " . ($selected == '4'?" selected ":"") . " value='4'>" . _("Credit Notes"). "</option>\n";
+       echo "<option " . ($selected == '5'?" selected ":"") . " value='5'>" . _("Delivery Notes"). "</option>\n";
        echo "</select></td>\n";
 }
 
 function supp_allocations_list_cells($name, $selected)
 {
        global $all_items;
+
+       default_focus($name);
        if ($selected == null)
                $selected = (!isset($_POST[$name]) ? "" : $_POST[$name]);
        echo "<td><select name='$name'>";
@@ -2100,6 +2111,7 @@ function supp_allocations_list_cells($name, $selected)
 
 function policy_list_cells($label, $name, $selected)
 {
+       default_focus($name);
        if ($selected == null)
        {
                $selected = (!isset($_POST[$name]) ? "" : $_POST[$name]);
@@ -2123,6 +2135,7 @@ function policy_list_row($label, $name, $selected)
 
 function credit_type_list_cells($label, $name, $selected, $submit_on_change=false)
 {
+       default_focus($name);
        if ($selected == null)
        {
                $selected = (!isset($_POST[$name]) ? "Return" : $_POST[$name]);
@@ -2150,6 +2163,7 @@ function credit_type_list_row($label, $name, $selected, $submit_on_change=false)
 
 function number_list($name, $selected, $from, $to, $firstlabel="")
 {
+       default_focus($name);
        if ($selected == null)
        {
                $selected = (!isset($_POST[$name]) ? $from : $_POST[$name]);