X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=f965991155997ef2032a1e8d4894dcfeeb1fb77e;hb=b0a033a1a2db727664018c496730a8be240879ec;hp=0eac3a11f1bf8d8d1e43e2d41956c06e9c71b39a;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index 0eac3a11..f9659911 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -2,6 +2,10 @@ include_once($path_to_root . "/includes/banking.inc"); +define("DEFVAL", "--"); +$search_button = " "; +//$search_button = " "; + $all_items = reserved_words::get_all(); // TDB for all list functions : if there is no data, display a link to the releveant @@ -9,6 +13,44 @@ $all_items = reserved_words::get_all(); function supplier_list($name, $selected_id, $all_option=false, $submit_on_change=false) { + global $all_items; + + 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')) + { + global $search_button; + $edit_name = $name."_edit"; + $edit_button = $name."_button"; + + $val = (isset($_POST[$edit_name]) && $_POST[$edit_name] != "" ? $_POST[$edit_name] : ""); + if (isset($_POST[$edit_button])) + { + $selected_id = $_POST[$name] = ""; + set_focus($name); + } + + if ($selected_id != "") + { + $val = DEFVAL; + $supplier_sql .= "WHERE supplier_id=$selected_id"; + } + elseif ($val != "" && $val != DEFVAL) + { + $supplier_sql .= "WHERE supp_name LIKE '%{$val}%'"; + } + + echo " "; + + echo sprintf($search_button, $edit_button); + } + + $supplier_result = db_query($supplier_sql." ORDER BY supp_name"); + if ($submit_on_change==true) echo ""; else @@ -16,34 +58,29 @@ function supplier_list($name, $selected_id, $all_option=false, $submit_on_change $company_currency = get_company_currency(); - $supplier_sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers ORDER BY supp_name"; - $supplier_result = db_query($supplier_sql); - - if ($selected_id == null) - $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); if ($all_option == true) { - if (reserved_words::get_all() == $selected_id) + if ($selected_id == $all_items) { - echo "" . _("All Suppliers") . "\n"; - } - else + echo "" . _("All Suppliers") . "\n"; + } + else { - echo "" . _("All Suppliers") . "\n"; + echo "" . _("All Suppliers") . "\n"; } - if ($selected_id == "") + if ($selected_id == "") { - $selected_id = reserved_words::get_all(); + $selected_id = $all_items; } } - while ($supplier_row = db_fetch_row($supplier_result)) + while ($supplier_row = db_fetch_row($supplier_result)) { - if ($selected_id==$supplier_row[0]) + if ($selected_id==$supplier_row[0]) { echo ""; - } - else + } + else { echo ""; } @@ -52,7 +89,7 @@ function supplier_list($name, $selected_id, $all_option=false, $submit_on_change if ($supplier_row[2] != $company_currency) echo " - " . $supplier_row[2]; echo "\n"; - if ($selected_id == "") + if ($selected_id == "") { $selected_id = $supplier_row[0]; $_POST[$name] = $selected_id; @@ -68,7 +105,7 @@ function supplier_list_cells($label, $name, $selected_id, $all_option=false, $su { if ($label != null) echo "$label\n"; - echo ""; + echo ""; supplier_list($name, $selected_id, $all_option, $submit_on_change); echo "\n"; } @@ -84,41 +121,72 @@ 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 $all_items; + + default_focus($name); + if ($selected_id == null) + $selected_id = ((!isset($_POST[$name]) || $_POST[$name] == "") ? "" : $_POST[$name]); + + $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"; + $edit_button = $name."_button"; + + $val = (isset($_POST[$edit_name]) && $_POST[$edit_name] != "" ? $_POST[$edit_name] : ""); + if (isset($_POST[$edit_button])) + { + $selected_id = $_POST[$name] = ""; + $_POST['branch_id'] = ""; + set_focus($name); + } + if ($selected_id != "") + { + $val = DEFVAL; + $customer_sql .= "WHERE debtor_no=$selected_id"; + } + elseif ($val != "" && $val != DEFVAL) + { + $customer_sql .= "WHERE name LIKE '%{$val}%'"; + } + echo " "; + + echo sprintf($search_button, $edit_button); + } + + + $customer_result = db_query($customer_sql." ORDER BY name"); + if ($submit_on_change==true) echo ""; else echo ""; - $customer_sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master ORDER BY name"; - $customer_result = db_query($customer_sql); - $company_currency = get_company_currency(); - if ($selected_id == null) - $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); if (($all_option == true)) { - if (reserved_words::get_all() == $selected_id) + if ($selected_id == $all_items) { - echo "" . _("All Customers") . "\n"; - } - else + echo "" . _("All Customers") . "\n"; + } + else { - echo "" . _("All Customers") . "\n"; + echo "" . _("All Customers") . "\n"; } - if ($selected_id == "") + if ($selected_id == "") { - $selected_id = reserved_words::get_all(); + $selected_id = $all_items; } } - - while ($customer_row = db_fetch_row($customer_result)) + while ($customer_row = db_fetch_row($customer_result)) { - if ($selected_id == $customer_row[0]) + if ($selected_id == $customer_row[0]) { echo ""; - } - else + } + else { echo ""; } @@ -130,7 +198,7 @@ function customer_list($name, $selected_id, $all_option=false, $submit_on_change echo "\n"; // if no initial selection - set the first item // do we want to do this for all lists ???? probably - if ($selected_id == "") + if ($selected_id == "") { $selected_id = $customer_row[0]; $_POST[$name] = $selected_id; @@ -138,7 +206,6 @@ function customer_list($name, $selected_id, $all_option=false, $submit_on_change } echo ""; - db_free_result($customer_result); } @@ -146,7 +213,7 @@ function customer_list_cells($label, $name, $selected_id, $all_option = false, $ { if ($label != null) echo "$label\n"; - echo ""; + echo ""; customer_list($name, $selected_id, $all_option, $submit_on_change); echo "\n"; } @@ -165,6 +232,7 @@ function customer_branches_list($customer_id, $name, $selected_id, { global $all_items; + default_focus($name); if ($submit_on_change==true) echo ""; else @@ -181,29 +249,29 @@ function customer_branches_list($customer_id, $name, $selected_id, if ($all_option == true) { echo "" . _("All Branches") . "\n"; + echo "value='$all_items'>" . _("All Branches") . "\n"; - if ($selected_id == "") + if ($selected_id == "") { - $selected_id = reserved_words::get_all(); + $selected_id = $all_items; } } - while ($row = db_fetch_row($result)) + while ($row = db_fetch_row($result)) { - if ($selected_id == $row[0]) + if ($selected_id == $row[0]) { echo ""; - } - else + } + else { echo ""; } echo $row[1] . "\n"; - if ($selected_id == "") + if ($selected_id == "") { $selected_id = $row[0]; $_POST[$name] = $selected_id; @@ -232,8 +300,11 @@ function customer_branches_list_row($label,$customer_id, $name, $selected_id, $a //------------------------------------------------------------------------------------------------ -function locations_list($name, $selected_id, $all_option=false, $submit_on_change=false, $all_option_name="") +function locations_list($name, $selected_id, $all_option=false, $submit_on_change=false) { + global $all_items; + + default_focus($name); if ($submit_on_change == true) echo ""; else @@ -251,28 +322,29 @@ function locations_list($name, $selected_id, $all_option=false, $submit_on_chang if ($all_option == true) { echo "" . _("All Locations") . "\n"; + echo " value='$all_items'>" . _("All Locations") . "\n"; - if ($selected_id == "") { - $selected_id = reserved_words::get_all(); + if ($selected_id == "") + { + $selected_id = $all_items; } } - while ($row = db_fetch_row($result)) + while ($row = db_fetch_row($result)) { - if ($selected_id == $row[0]) + if ($selected_id == $row[0]) { echo ""; - } - else + } + else { echo ""; } echo $row[1] . "\n"; - if ($selected_id == "") + if ($selected_id == "") { $selected_id = $row[0]; $_POST[$name] = $selected_id; @@ -304,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 ""; else @@ -316,20 +389,20 @@ function currencies_list($name, &$selected_id, $submit_on_change=false) if ($selected_id == null) $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); - while ($row = db_fetch_row($result)) + while ($row = db_fetch_row($result)) { // default to the company currency - if ($selected_id == "" && ($row[0] == $company_currency)) + if ($selected_id == "" && ($row[0] == $company_currency)) { $selected_id = $row[0]; $_POST[$name] = $selected_id; } - if ($selected_id == $row[0]) + if ($selected_id == $row[0]) { echo ""; - } - else + } + else { echo ""; } @@ -360,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 ""; else @@ -372,20 +446,20 @@ function fiscalyears_list($name, &$selected_id, $submit_on_change=false) if ($selected_id == null) $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); - while ($row = db_fetch_row($result)) + while ($row = db_fetch_row($result)) { // default to the company current fiscal year - if ($selected_id == "" && ($row[0] == $company_year)) + if ($selected_id == "" && ($row[0] == $company_year)) { $selected_id = $row[0]; $_POST[$name] = $selected_id; } - if ($selected_id == $row[0]) + if ($selected_id == $row[0]) { echo ""; - } - else + } + else { echo ""; } @@ -393,6 +467,8 @@ function fiscalyears_list($name, &$selected_id, $submit_on_change=false) $how = _('Active'); else $how = _('Closed'); + $row[1] = sql2date($row[1]); + $row[2] = sql2date($row[2]); echo $row[1] . " - " . $row[2] . " " . $how . "\n"; } @@ -419,9 +495,12 @@ function fiscalyears_list_row($label, $name, $selected_id) //--------------------------------------------------------------------------------------------------- function simple_codeandname_list($sql, $name, &$selected_id, - $all_option=false, $all_option_name=null, $all_option_numeric=false, + $all_option=false, $all_option_name=null, $all_option_numeric=false, $submit_on_change=false, $returnzero=false) { + global $all_items; + + default_focus($name); if ($submit_on_change == true) echo ""; else @@ -436,17 +515,17 @@ function simple_codeandname_list($sql, $name, &$selected_id, elseif ($all_option_numeric) $reserved_word = reserved_words::get_all_numeric(); else - $reserved_word = reserved_words::get_all(); + $reserved_word = $all_items; - if ($reserved_word == $selected_id) + if ($selected_id == $reserved_word) { - echo "" . $all_option_name . "\n"; - } - else + echo "$all_option_name\n"; + } + else { - echo "" . $all_option_name . "\n"; + echo "$all_option_name\n"; } - if ($selected_id == "") + if ($selected_id == "") { $selected_id = $reserved_word; } @@ -454,9 +533,9 @@ function simple_codeandname_list($sql, $name, &$selected_id, $result = db_query($sql); - while ($row = db_fetch_row($result)) + while ($row = db_fetch_row($result)) { - if ($selected_id == $row[0]) + if ($selected_id == $row[0]) { echo ""; } else { @@ -464,7 +543,7 @@ function simple_codeandname_list($sql, $name, &$selected_id, } echo $row[1] . "\n"; - if (!$returnzero && $selected_id == "") + if (!$returnzero && $selected_id == "") { $selected_id = $row[0]; $_POST[$name] = $selected_id; @@ -480,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) { @@ -490,13 +570,13 @@ function dimensions_list($name, &$selected_id, $no_option=false, $showname=null, $sql .= " AND type_=$showtype"; else if ($showtype) $sql .= " type_=$showtype"; - } - $sql .= " ORDER BY reference"; - simple_codeandname_list($sql, $name, &$selected_id, $no_option, $showname, + } + $sql .= " ORDER BY reference"; + simple_codeandname_list($sql, $name, $selected_id, $no_option, $showname, true, $submit_on_change, true); } -function dimensions_list_cells($label, $name, $selected_id, $no_option=false, $showname=null, +function dimensions_list_cells($label, $name, $selected_id, $no_option=false, $showname=null, $showclosed=false, $showtype=0) { if ($label != null) @@ -506,11 +586,11 @@ function dimensions_list_cells($label, $name, $selected_id, $no_option=false, $s echo "\n"; } -function dimensions_list_row($label, $name, $selected_id, $no_option=false, $showname=null, +function dimensions_list_row($label, $name, $selected_id, $no_option=false, $showname=null, $showclosed=false, $showtype=0) { echo "\n"; - dimensions_list_cells($label, $name, $selected_id, $no_option, $showname, + dimensions_list_cells($label, $name, $selected_id, $no_option, $showname, $showclosed, $showtype); echo "\n"; } @@ -520,42 +600,77 @@ 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; + + 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"; + + if (get_company_pref('no_item_list')) + { + global $search_button; + $edit_name = $name."_edit"; + $edit_button = $name."_button"; + + $val = (isset($_POST[$edit_name]) && $_POST[$edit_name] != "" ? $_POST[$edit_name] : ""); + + if (isset($_POST[$edit_button])) + { + $selected_id = $_POST[$name] = ""; + set_focus($name); + } + if ($selected_id != "") + { + $val = DEFVAL; + $sql .= " AND stock_id='$selected_id'"; + } + elseif ($val != "" && $val != DEFVAL) + { + $sql .= " AND + (stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR " + .TB_PREF."stock_master.description LIKE '%{$val}%')"; + } + + echo " "; + + echo sprintf($search_button, $edit_button); + } + $result = db_query($sql); + + if ($submit_on_change==true) echo ""; - else if ($extra != "") + else if ($extra != "") echo ""; else echo ""; - $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); - - if ($selected_id == null) - $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); if (($all_option == true)) { - if ($all_items == $selected_id) + if ($selected_id == $all_items) { echo "" . _("All Items") . "\n"; - } - else + } + else { echo "" . _("All Items") . "\n"; } - if ($selected_id == "") + if ($selected_id == "") { $selected_id = $all_items; } } - while ($row = db_fetch_row($result)) + while ($row = db_fetch_row($result)) { - if ($selected_id == $row[0]) + if ($selected_id == $row[0]) { echo ""; - } - else + } + else { echo ""; } @@ -563,22 +678,21 @@ function stock_items_list($name, $selected_id, $all_option=false, $submit_on_cha // if no initial selection - set the first item // do we want to do this for all lists ???? probably - if ($selected_id == "") + if ($selected_id == "") { $selected_id = $row[0]; $_POST[$name] = $selected_id; } } - echo ""; db_free_result($result); } function stock_items_list_cells($label, $name, $selected_id, $all_option=false, $submit_on_change=false, $extra="") { - if ($label != null) + if ($label != null) echo "$label\n"; - echo ""; + echo ""; stock_items_list($name, $selected_id, $all_option, $submit_on_change, $extra); echo "\n"; } @@ -596,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 ""; else @@ -610,33 +725,33 @@ function stock_bom_items_list($name, $selected_id, $all_option=false, $submit_on $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); if (($all_option == true)) { - if ($all_items == $selected_id) + if ($selected_id == $all_items) { echo "" . _("All Items") . "\n"; - } - else + } + else { echo "" . _("All Items") . "\n"; } - if ($selected_id == "") + if ($selected_id == "") { $selected_id = $all_items; } } - while ($row = db_fetch_row($result)) + while ($row = db_fetch_row($result)) { - if ($selected_id==$row[0]) + if ($selected_id==$row[0]) { echo ""; - } - else + } + else { echo ""; } echo (user_show_codes()?$row[0] . " - ":"") . $row[2] . " - " . $row[1] . "\n"; - if ($selected_id == "") + if ($selected_id == "") { $selected_id = $row[0]; $_POST[$name] = $selected_id; @@ -668,9 +783,12 @@ function stock_bom_items_list_row($label, $name, $selected_id, $all_option=false function base_stock_items_list($sql, $name, &$selected_id, $all_option=false, $all_option_name="", $submit_on_change=false, $extra="") { + global $all_items; + + default_focus($name); if ($submit_on_change==true) echo ""; - else if ($extra != "") + else if ($extra != "") echo ""; else echo ""; @@ -681,33 +799,33 @@ function base_stock_items_list($sql, $name, &$selected_id, $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); if ($all_option == true) { - if (reserved_words::get_all() == $selected_id) + if ($selected_id == $all_items) { - echo "" . $all_option_name . "\n"; - } - else + echo "$all_option_name\n"; + } + else { - echo "" . $all_option_name . "\n"; + echo "$all_option_name\n"; } - if ($selected_id == "") + if ($selected_id == "") { - $selected_id = reserved_words::get_all(); + $selected_id = $all_items; } } - while ($row = db_fetch_row($result)) + while ($row = db_fetch_row($result)) { - if ($selected_id == $row[0]) + if ($selected_id == $row[0]) { echo ""; - } - else + } + else { echo ""; } echo (user_show_codes()?$row[0] . " - ":"") . $row[2] . " - " . $row[1] . "\n"; - if ($selected_id == "") + if ($selected_id == "") { $selected_id = $row[0]; $_POST[$name] = $selected_id; @@ -720,14 +838,14 @@ function base_stock_items_list($sql, $name, &$selected_id, //------------------------------------------------------------------------------------ -function stock_manufactured_items_list($name, $selected_id, +function stock_manufactured_items_list($name, &$selected_id, $all_option=false, $submit_on_change=false) { $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 (".TB_PREF."stock_master.mb_flag='M')"; - base_stock_items_list($sql, $name, &$selected_id, $all_option, _("All Items"), + base_stock_items_list($sql, $name, $selected_id, $all_option, _("All Items"), $submit_on_change); } @@ -757,21 +875,98 @@ function stock_component_items_list($name, $parent_stock_id, &$selected_id, ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id AND stock_id != '$parent_stock_id'"; - base_stock_items_list($sql, $name, &$selected_id, + base_stock_items_list($sql, $name, $selected_id, $all_option, _("All Items"), $submit_on_change); } //------------------------------------------------------------------------------------ -function stock_purchasable_items_list($name, &$selected_id, - $all_option=false, $submit_on_change=false, $extra="") +function stock_purchasable_items_list($name, &$selected_id, $all_option=false, $submit_on_change=false, $extra="") { + global $all_items; + + 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'"; + 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"; + + $val = (isset($_POST[$edit_name]) && $_POST[$edit_name] != "" ? $_POST[$edit_name] : ""); + if (isset($_POST[$edit_button])) + { + $selected_id = $_POST[$name] = ""; + set_focus($name); + } + + if ($selected_id != "") + { + $val = DEFVAL; + $sql .= "AND stock_id='$selected_id'"; + } + elseif ($val != "" && $val != DEFVAL) + { + $sql = "AND + (stock_id LIKE '%{$val}%' OR ".TB_PREF."stock_category.description LIKE '%{$val}%' OR " + .TB_PREF."stock_master.description LIKE '%{$val}%')"; + } + + echo " "; - base_stock_items_list($sql, $name, &$selected_id, - $all_option, _("All Items"), $submit_on_change, $extra); + echo " "; + } + + $result = db_query($sql); + + if ($submit_on_change==true) + echo ""; + else if ($extra != "") + echo ""; + else + echo ""; + + if ($all_option == true) + { + if ($selected_id == $all_items) + { + echo ""._("All Items")."\n"; + } + else + { + echo ""._("All Items")."\n"; + } + if ($selected_id == "") + { + $selected_id = $all_items; + } + } + + while ($row = db_fetch_row($result)) + { + if ($selected_id == $row[0]) + { + echo ""; + } + else + { + echo ""; + } + echo (user_show_codes()?$row[0] . " - ":"") . $row[2] . " - " . $row[1] . "\n"; + + if ($selected_id == "") + { + $selected_id = $row[0]; + $_POST[$name] = $selected_id; + } + } + + echo ""; + db_free_result($result); } function stock_purchasable_items_list_cells($label, $name, &$selected_id, $all_option=false, $submit_on_change=false, $extra = "") @@ -799,7 +994,7 @@ function stock_costable_items_list($name, &$selected_id, 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 !='D'"; - base_stock_items_list($sql, $name, &$selected_id, + base_stock_items_list($sql, $name, $selected_id, $all_option, _("All Items"), $submit_on_change); } @@ -807,10 +1002,11 @@ function stock_costable_items_list($name, &$selected_id, function stock_item_types_list_row($label, $name, $selected_id, $enabled=true) { + default_focus($name); echo ""; if ($label != NULL) echo "$label\n"; - echo ""; + echo ""; if ($enabled) echo "\n"; else @@ -829,25 +1025,30 @@ function stock_units_list_row($label, $name, $value, $enabled=true) { global $stock_units; + default_focus($name); + $result = get_all_item_units(); echo "$label\n"; if ($enabled) echo ""; else echo ""; - + 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 "$unit\n"; - } - else + echo "$descr\n"; + } + else { - echo "$unit\n"; + echo "$descr\n"; } } echo "\n"; @@ -858,11 +1059,11 @@ 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); } -function tax_types_list_cells($label, $name, $selected_id, $none_option=false, +function tax_types_list_cells($label, $name, $selected_id, $none_option=false, $none_option_name=null, $submit_on_change=false) { if ($label != null) @@ -872,7 +1073,7 @@ function tax_types_list_cells($label, $name, $selected_id, $none_option=false, echo "\n"; } -function tax_types_list_row($label, $name, $selected_id, $none_option=false, +function tax_types_list_row($label, $name, $selected_id, $none_option=false, $none_option_name=null, $submit_on_change=false) { echo "\n"; @@ -970,10 +1171,10 @@ function sales_persons_list_cells($label, $name, $selected_id) echo "\n"; } -function sales_persons_list_row($label, $name, $selected_id) +function sales_persons_list_row($label, $name, $selected_id, $submit_on_change=false) { echo "\n"; - sales_persons_list_cells($label, $name, $selected_id); + sales_persons_list_cells($label, $name, $selected_id, $submit_on_change=false); echo "\n"; } @@ -1075,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 "$label\n"; echo ""; - sales_types_list($name, $selected_id); + sales_types_list($name, $selected_id, $submit_on_change); echo "\n"; } -function sales_types_list_row($label, $name, $selected_id) +function sales_types_list_row($label, $name, $selected_id, $submit_on_change=false) { echo "\n"; - sales_types_list_cells($label, $name, $selected_id); + sales_types_list_cells($label, $name, $selected_id, $submit_on_change); echo "\n"; } @@ -1150,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 ""; $sql = "SELECT id, name FROM ".TB_PREF."workcentres"; @@ -1159,23 +1362,23 @@ function workcenter_list($name, $selected_id, $all_option=false) $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); if ($all_option == true) { - if ($all_items == $selected_id) + if ($selected_id == $all_items) { echo "" . _("All Work Centres") . "\n"; - } - else + } + else { echo "" . _("All Work Centres") . "\n"; } } - while ($row = db_fetch_row($result)) + while ($row = db_fetch_row($result)) { - if ($selected_id == $row[0]) + if ($selected_id == $row[0]) { echo ""; - } - else + } + else { echo ""; } @@ -1188,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 "$label\n"; echo ""; @@ -1206,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 ""; else @@ -1220,13 +1425,13 @@ function bank_accounts_list($name, $selected_id, $submit_on_change=false) if ($selected_id == null) $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); - while ($row = db_fetch_row($result)) + while ($row = db_fetch_row($result)) { - if ($selected_id == $row[0]) + if ($selected_id == $row[0]) { echo ""; - } - else + } + else { echo ""; } @@ -1238,7 +1443,7 @@ function bank_accounts_list($name, $selected_id, $submit_on_change=false) { $selected_id = $row[0]; $_POST[$name] = $selected_id; - } + } } echo ""; @@ -1265,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 ""; else @@ -1275,13 +1481,13 @@ function class_list($name, $selected_id, $submit_on_change=false) if ($selected_id == null) $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); - while ($row = db_fetch_row($result)) + while ($row = db_fetch_row($result)) { - if ($selected_id == $row[0]) + if ($selected_id == $row[0]) { echo ""; - } - else + } + else { echo ""; } @@ -1290,7 +1496,7 @@ function class_list($name, $selected_id, $submit_on_change=false) { $selected_id = $row[0]; $_POST[$name] = $selected_id; - } + } } echo ""; @@ -1360,19 +1566,20 @@ function gl_account_types_list_row($label, $name, $selected_id, $all_option=fals $all_option_numeric=false) { echo "\n"; - gl_account_types_list_cells($label, $name, $selected_id, $all_option, + gl_account_types_list_cells($label, $name, $selected_id, $all_option, $all_option_name, $all_option_numeric); echo "\n"; } //----------------------------------------------------------------------------------------------- -function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false, - $show_group=false, $onchange="") +function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false, + $show_group=false, $params="") { + default_focus($name); echo ""; if ($skip_bank_accounts) @@ -1391,27 +1598,27 @@ function gl_all_accounts_list($name, $selected_id, $skip_bank_accounts=false, $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); $result = db_query($sql, "query chart master"); - while ($row = db_fetch_row($result)) + while ($row = db_fetch_row($result)) { - if ($selected_id == $row[0]) + if ($selected_id == $row[0]) { echo ""; - } - else + } + else { echo ""; } //echo str_pad($row[0],6,'0', STR_PAD_LEFT) . " " . $row[2] . " " . $row[1]; if ($show_group) echo $row[0] . " " . $row[2] . " " . $row[1] . "\n"; - else + else echo $row[0] . " " . $row[1] . "\n"; if ($selected_id == "") { $selected_id = $row[0]; $_POST[$name] = $selected_id; - } + } } echo ""; @@ -1419,36 +1626,37 @@ 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 "$label\n"; echo ""; - 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 "\n"; } function gl_all_accounts_list_row($label, $name, $selected_id, $skip_bank_accounts=false, - $show_group=false, $onchange="") + $show_group=false, $params="") { echo "\n"; - gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts, - $show_group, $onchange); + gl_all_accounts_list_cells($label, $name, $selected_id, $skip_bank_accounts, + $show_group, $params); echo "\n"; } function yesno_list($name, $selected_id, $name_yes="", $name_no="", $submit_on_change=false) { + default_focus($name); if ($submit_on_change == true) echo ""; else echo ""; - if (strlen($name_yes) == 0) + if (strlen($name_yes) == 0) { unset($name_yes); } - if (strlen($name_no) == 0) + if (strlen($name_no) == 0) { unset($name_no); } @@ -1459,18 +1667,18 @@ function yesno_list($name, $selected_id, $name_yes="", $name_no="", $submit_on_c echo ""; else echo ""; - if (!isset($name_yes)) - echo _("Yes") . "\n"; - else - echo $name_yes . "\n"; + if (!isset($name_yes)) + echo _("Yes") . "\n"; + else + echo $name_yes . "\n"; if ($selected_id == 0) echo ""; - else + else echo ""; - if (!isset($name_no)) - echo _("No") . "\n"; - else - echo $name_no . "\n"; + if (!isset($name_no)) + echo _("No") . "\n"; + else + echo $name_no . "\n"; echo ""; } @@ -1496,14 +1704,15 @@ function languages_list($name, &$selected_id) { global $installed_languages; + default_focus($name); echo ""; if ($selected_id == null) $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); - foreach ($installed_languages as $lang) + foreach ($installed_languages as $lang) { echo "" . $lang['name'] . "\n"; } @@ -1531,14 +1740,15 @@ function bank_account_types_list($name, &$selected_id) { $bank_account_types = bank_account_types::get_all(); + default_focus($name); echo ""; if ($selected_id == null) $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); - foreach ($bank_account_types as $type) + foreach ($bank_account_types as $type) { echo "" . $type['name'] . "\n"; } @@ -1566,6 +1776,7 @@ function payment_person_types_list($name, $selected_id, $related=null) { $types = payment_person_types::get_all(); + default_focus($name); echo "" . $type['name'] . "\n"; } @@ -1609,17 +1820,19 @@ function wo_types_list($name, &$selected_id) { $types = wo_types::get_all(); + default_focus($name); echo ""; if ($selected_id == null) $selected_id = (!isset($_POST[$name]) ? "" : $_POST[$name]); - foreach ($types as $type) + foreach ($types as $type) { echo "" . $type['name'] . "\n"; } + echo ""; } function wo_types_list_row($label, $name, &$selected_id) @@ -1635,20 +1848,21 @@ function dateformats_list_row($label, $name, $value) { global $dateformats; + default_focus($name); echo "$label\n"; echo ""; if ($value == null) $value = (!isset($_POST[$name]) ? 0 : $_POST[$name]); $counter = 0; - foreach ($dateformats as $df) + foreach ($dateformats as $df) { if ($value==$counter) { echo "$df\n"; - } - else + } + else { echo "$df\n"; } @@ -1661,20 +1875,21 @@ function dateseps_list_row($label, $name, $value) { global $dateseps; + default_focus($name); echo "$label\n"; echo ""; if ($value == null) $value = (!isset($_POST[$name]) ? 0 : $_POST[$name]); $counter = 0; - foreach ($dateseps as $ds) + foreach ($dateseps as $ds) { if ($value==$counter) { echo "$ds\n"; - } - else + } + else { echo "$ds\n"; } @@ -1687,20 +1902,21 @@ function thoseps_list_row($label, $name, $value) { global $thoseps; + default_focus($name); echo "$label\n"; echo ""; if ($value == null) $value = (!isset($_POST[$name]) ? 0 : $_POST[$name]); $counter = 0; - foreach ($thoseps as $ts) + foreach ($thoseps as $ts) { if ($value==$counter) { echo "$ts\n"; - } - else + } + else { echo "$ts\n"; } @@ -1713,20 +1929,21 @@ function decseps_list_row($label, $name, $value) { global $decseps; + default_focus($name); echo "$label\n"; echo ""; if ($value == null) $value = (!isset($_POST[$name]) ? 0 : $_POST[$name]); $counter = 0; - foreach ($decseps as $ds) + foreach ($decseps as $ds) { if ($value==$counter) { echo "$ds\n"; - } - else + } + else { echo "$ds\n"; } @@ -1737,21 +1954,31 @@ 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 "$label\n"; echo ""; if ($value == null) $value = (!isset($_POST[$name]) ? "" : $_POST[$name]); - foreach ($themes as $th) + foreach ($themes as $th) { if ($value==$th) { echo "$th\n"; - } - else + } + else { echo "$th\n"; } @@ -1763,19 +1990,20 @@ function pagesizes_list_row($label, $name, $value) { global $pagesizes; + default_focus($name); echo "$label\n"; echo ""; if ($value == null) $value = (!isset($_POST[$name]) ? "" : $_POST[$name]); - foreach ($pagesizes as $pz) + foreach ($pagesizes as $pz) { if ($value==$pz) { echo "$pz\n"; - } - else + } + else { echo "$pz\n"; } @@ -1787,20 +2015,21 @@ function security_headings_list_row($label, $name, $value) { global $security_headings; + default_focus($name); echo "$label\n"; echo ""; if ($value == null) $value = (!isset($_POST[$name]) ? 0 : (int)$_POST[$name]); $counter=0; - foreach ($security_headings as $sh) + foreach ($security_headings as $sh) { if ($value==$counter) { echo "$sh\n"; - } - else + } + else { echo "$sh\n"; } @@ -1813,10 +2042,11 @@ function systypes_list_cells($label, $name, $value, $submit_on_change=false) { global $systypes_array; + default_focus($name); if ($label != null) echo "$label\n"; echo ""; else echo ">"; @@ -1828,13 +2058,13 @@ function systypes_list_cells($label, $name, $value, $submit_on_change=false) if ($value==$key) { echo "".$type['name']."\n"; - } - else + } + else { echo "".$type['name']."\n"; } } - echo "\n"; + echo "\n"; } function systypes_list_row($label, $name, $value, $submit_on_change=false) @@ -1846,47 +2076,54 @@ 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) $selected = (!isset($_POST[$name]) ? "" : $_POST[$name]); echo ""; - echo "" . _("All Types"). "\n"; + echo "" . _("All Types"). "\n"; echo "" . _("Sales Invoices"). "\n"; echo "" . _("Overdue Invoices"). "\n"; echo "" . _("Payments"). "\n"; echo "" . _("Credit Notes"). "\n"; - echo "\n"; + echo "" . _("Delivery Notes"). "\n"; + echo "\n"; } function supp_allocations_list_cells($name, $selected) { + global $all_items; + + default_focus($name); if ($selected == null) $selected = (!isset($_POST[$name]) ? "" : $_POST[$name]); echo ""; - echo "" . _("All Types"). "\n"; + echo "" . _("All Types"). "\n"; echo "" . _("Invoices"). "\n"; echo "" . _("Overdue Invoices"). "\n"; echo "" . _("Payments"). "\n"; echo "" . _("Credit Notes"). "\n"; echo "" . _("Overdue Credit Notes"). "\n"; - echo "\n"; + echo "\n"; } function policy_list_cells($label, $name, $selected) { + default_focus($name); if ($selected == null) { $selected = (!isset($_POST[$name]) ? "" : $_POST[$name]); - if ($selected == "") + if ($selected == "") $_POST[$name] = $selected; - } + } if ($label != null) label_cell($label); echo ""; echo "" . _("Automatically put balance on back order"). "\n"; echo "" . _("Cancel any quantites not delivered"). "\n"; - echo "\n"; + echo "\n"; } function policy_list_row($label, $name, $selected) @@ -1898,12 +2135,13 @@ 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]); - if ($selected == "Return") + if ($selected == "Return") $_POST[$name] = $selected; - } + } if ($label != null) label_cell($label); echo ""; echo "" . _("Items Returned to Inventory Location"). "\n"; echo "" . _("Items Written Off"). "\n"; - echo "\n"; + echo "\n"; } function credit_type_list_row($label, $name, $selected, $submit_on_change=false) @@ -1925,12 +2163,13 @@ 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]); - if ($selected == $from) + if ($selected == $from) $_POST[$name] = $selected; - } + } echo ""; for ($i = $from; $i <= $to; $i++) { @@ -1941,13 +2180,13 @@ function number_list($name, $selected, $from, $to, $firstlabel="") if ($selected == $i) { echo "$label\n"; - } - else + } + else { echo "$label\n"; } } - echo "\n"; + echo "\n"; } function number_list_cells($label, $name, $selected, $from, $to) @@ -1957,7 +2196,7 @@ function number_list_cells($label, $name, $selected, $from, $to) echo "\n"; number_list($name, $selected, $from, $to); echo "\n"; -} +} function number_list_row($label, $name, $selected, $from, $to) {