Layout/focus fixes for no_[customer/supplier/item]_list on

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e9635d12c6033e5b0799d25aa56024c555a84f9f..032b80f0af56e9111e2a05997fec1b82bddb853f 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,15 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+28-Mar-2008 Janusz Dobrowolski
+# Layout/focus fixes for no_[customer/supplier/item]_list option on
+   /includes/ui/ui_lists.inc
+   /purchasing/includes/ui/po_ui.inc
+   /sales/credit_note_entry.php
+   /sales/sales_order_entry.php
+   /sales/includes/ui/sales_credit_ui.inc
+   /sales/includes/ui/sales_order_ui.inc
+
 27-Mar-2008 Janusz Dobrowolski
 + Automatic first field focus on page start, focus order preserved between form updates
 $  /gl/inquiry/gl_account_inquiry.php
@@ -29,8 +38,8 @@ $  /gl/inquiry/gl_account_inquiry.php
    /includes/ui/ui_view.inc
    /js/inserts.js
    /sales/sales_order_entry.php
-   /ales/credit_note_entry.php
-   /ales/includes/ui/sales_credit_ui.inc
+   /sales/credit_note_entry.php
+   /sales/includes/ui/sales_credit_ui.inc
    /sales/includes/ui/sales_order_ui.inc
 + Data picker omitted in keyboard tabbing sequence (FF,IE, not old mozilla)
 $  /includes/ui/ui_input.inc

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index ba5f42a465d03561d3f176215ddcbb1245ed21d6..7c31bd692e85b2b804979a41f8723ab17bb103a0 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -18,8 +18,10 @@ 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]);
-       $no_supplier_list = get_company_pref('no_supplier_list');
-       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";
@@ -29,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();'>";
@@ -133,8 +126,9 @@ function customer_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]);
-       $no_customer_list = get_company_pref('no_customer_list');
-       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";
@@ -145,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
@@ -619,8 +604,12 @@ 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]);
-       $no_item_list = get_company_pref('no_item_list');
-       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";
@@ -631,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();'>";
@@ -914,8 +888,11 @@ 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]);
-       $no_item_list = get_company_pref('no_item_list');
-       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'))
        {
                $edit_name = $name."_edit";
                $edit_button = $name."_button";
@@ -924,42 +901,27 @@ 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' > ";
 
                echo "<input type='submit' class='inputsubmit' name='$edit_button' value='?'> ";
        }
-       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);
-       }
+
+       $result = db_query($sql);
 
        if ($submit_on_change==true)
                echo "<select name='$name' onchange='this.form.submit();'>";
@@ -1993,7 +1955,7 @@ function decseps_list_row($label, $name, $value)
 function themes_list_row($label, $name, $value)
 {
        global $path_to_root;
-       
+
        default_focus($name);
        $path = $path_to_root.'/themes/';
        $themes = array();
@@ -2001,7 +1963,7 @@ function themes_list_row($label, $name, $value)
        while(false !== ($fname = readdir($themedir))) {
            if($fname!='.' && $fname!='..' && $fname!='CVS' && is_dir($path.$fname)) {
                        $themes[] =  $fname;
-           } 
+           }
        }
        sort($themes);
        echo "<tr><td>$label</td>\n";

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index f5a77a208367b2e0a8519fd2fbbb690a202c0583..a4f5115b798fb2533c37a69bcebc0b2bc8aba56b 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -297,7 +297,7 @@ function po_item_controls(&$order, $stock_id=null)
                $no_item_list = get_company_pref('no_item_list');
                if ($no_item_list)
                {
-                       echo "<td colspan=2>\n";
+                       echo "<td colspan=2 nowrap>\n";
                        stock_purchasable_items_list('stock_id', $_POST['stock_id'], false, true);
                        echo "</td>\n";
                }

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 5b2af3b2e63b388152d7ea34859f7d3d37e1ced4..86ce24663f335ef4b35f157d2cbc66ea4ec4fedc 100644 (file)
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -54,6 +54,11 @@ if (isset($_GET['AddedID'])) {
 
        display_footer_exit();
 }
+//--------------------------------------------------------------------------------
+
+function line_start_focus() {
+  set_focus(get_company_pref('no_supplier_list') ? 'stock_id_edit' : 'StockID2');
+}
 
 //-----------------------------------------------------------------------------
 
@@ -163,7 +168,7 @@ function handle_update_item()
                $_SESSION['Items']->update_cart_item($_POST['line_no'], input_num('qty'),
                        input_num('price'), input_num('Disc') / 100);
        }
-    set_focus('StockID2');
+    line_start_focus();
 }
 
 //-----------------------------------------------------------------------------
@@ -171,7 +176,7 @@ function handle_update_item()
 function handle_delete_item($line_no)
 {
        $_SESSION['Items']->remove_from_cart($line_no);
-    set_focus('StockID2');
+    line_start_focus();
 }
 
 //-----------------------------------------------------------------------------
@@ -184,7 +189,7 @@ function handle_new_item()
 
        add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'),
                input_num('price'), input_num('Disc') / 100);
-    set_focus('StockID2');
+    line_start_focus();
 }
 //-----------------------------------------------------------------------------
 $id = find_submit('Delete');
@@ -201,7 +206,7 @@ if (isset($_POST['UpdateItem']))
        handle_update_item();
 
 if (isset($_POST['CancelItemChanges']) || isset($_POST['UpdateItem']))
-       set_focus('StockID2');
+       line_start_focus();
 
 //-----------------------------------------------------------------------------
 

diff --git a/sales/includes/ui/sales_credit_ui.inc b/sales/includes/ui/sales_credit_ui.inc
index a2a3ff5b825be8701494c21252308090bb586f66..5fab4ce7305e45bf8b582e741930fd2a221548a4 100644 (file)
--- a/sales/includes/ui/sales_credit_ui.inc
+++ b/sales/includes/ui/sales_credit_ui.inc
@@ -192,10 +192,9 @@ function credit_edit_item_controls(&$order, $rowcounter, $line_no=-1)
        }
        else
        {
-               global $no_item_list; 
-               if ($no_item_list)
+               if (get_company_pref('no_item_list'))
                {
-                       echo "<td colspan=2>\n";
+                       echo "<td colspan=2 nowrap>\n";
                        stock_items_list('stock_id', null, false, true);
                        echo "</td>\n";
                }

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index a58cb9ee0f26d3c31955bbfb9e147c175128314b..5ed2fcdc5808c56a2dc8acf81f4c153b78447735 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -98,7 +98,7 @@ function display_order_summary($title, &$order, $editable_items=false)
        $k = 0;  //row colour counter
 
        $id = find_submit('Edit');
-       
+
        foreach ($order->line_items as $line_no=>$stock_item)
        {
 
@@ -325,10 +325,10 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
        }
        else
        {
-               global $no_item_list;
-               if ($no_item_list)
+
+               if (get_company_pref('no_item_list'))
                {
-                       echo "<td colspan=2>\n";
+                       echo "<td colspan=2 nowrap>\n";
                        stock_items_list('stock_id', null, false, true);
                        echo "</td>\n";
                }
@@ -422,7 +422,7 @@ function display_delivery_details(&$order)
        text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25);
        textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
 
-       small_amount_row(_("Shipping Charge:"), 'freight_cost', 
+       small_amount_row(_("Shipping Charge:"), 'freight_cost',
            price_format($_POST['freight_cost']));
 
        shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 7e271a5686ee3c78ccac4ce4e910ebd4893f03a2..f311cdcaff88e18628f011321a86e75931af2a61 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -181,7 +181,11 @@ function copy_from_cart()
        $_POST['branch_id'] = $cart->Branch;
        $_POST['sales_type'] = $cart->sales_type;
 }
+//--------------------------------------------------------------------------------
 
+function line_start_focus() {
+  set_focus(get_company_pref('no_supplier_list') ? 'stock_id_edit' : 'StockID2');
+}
 //--------------------------------------------------------------------------------
 
 function can_process() {
@@ -284,7 +288,7 @@ function handle_update_item()
                 input_num('Disc') / 100 );
        }
   copy_from_cart();
-  set_focus('StockID2');
+  line_start_focus();
 }
 
 //--------------------------------------------------------------------------------
@@ -296,7 +300,7 @@ function handle_delete_item($line_no)
     } else {
        display_error(_("This item cannot be deleted because some of it has already been delivered."));
     }
-    set_focus('StockID2');
+    line_start_focus();
 }
 
 //--------------------------------------------------------------------------------
@@ -310,7 +314,7 @@ function handle_new_item()
                input_num('price'), input_num('Disc') / 100);
 
        $_POST['StockID2'] = $_POST['stock_id'] = "";
-       set_focus('StockID2');
+       line_start_focus();
 }
 
 //--------------------------------------------------------------------------------
@@ -397,7 +401,7 @@ if (isset($_POST['AddItem']))
        handle_new_item();
 
 if (isset($_POST['CancelItemChanges']) || isset($_POST['UpdateItem']))
-       set_focus('StockID2');
+       line_start_focus();
 
 //--------------------------------------------------------------------------------