X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=67d95b97219f84953d69e2b0b9f0cd36a45e3c92;hb=5ceece3a1a031ad1dbfbcb11d3aabfca97a56f6b;hp=101d3d3c4e56f898197ff508408a467883d2395f;hpb=4358c55dc780dace88d9843054c2898bf602d666;p=fa-stable.git diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index 101d3d3c..67d95b97 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -6,10 +6,10 @@ include_once($path_to_root . "/includes/types.inc"); include_once($path_to_root . "/includes/current_user.inc"); $_search_button = " "; + ."%s/images/locate.png) no-repeat;%s' aspect='fallback' name='%s' value=' ' title='"._("Set filter")."'> "; $_select_button = " "; + ."%s/images/button_ok.png) no-repeat;%s' aspect='fallback' name='%s' value=' ' title='"._("Select")."'> "; $all_items = reserved_words::get_all(); @@ -51,7 +51,8 @@ $opts = array( // default options 'box_hint' => null // box/selectors hints; null = std see below ); // ------ merge options with defaults ---------- - $opts = array_merge($opts, $options); + if($options != null) + $opts = array_merge($opts, $options); if (!is_array($opts['where'])) $opts['where'] = array($opts['where']); $search_box = $opts['search_box']===true ? '_'.$name.'_edit' : $opts['search_box']; @@ -231,7 +232,8 @@ $opts = array( // default options 'disabled' => false ); // ------ merge options with defaults ---------- - $opts = array_merge($opts, $options); + if($options != null) + $opts = array_merge($opts, $options); $select_submit = $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit']; $spec_id = $opts['spec_id']; $spec_option = $opts['spec_option']; @@ -482,20 +484,20 @@ return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency', ) ); } -function currencies_list_cells($label, $name, $selected_id=null) +function currencies_list_cells($label, $name, $selected_id=null, $submit_on_change=false) { if ($label != null) echo "$label\n"; echo ""; - $str = currencies_list($name, $selected_id); + $str = currencies_list($name, $selected_id, $submit_on_change); echo "\n"; return $str; } -function currencies_list_row($label, $name, $selected_id=null) +function currencies_list_row($label, $name, $selected_id=null, $submit_on_change=false) { echo "\n"; - $str = currencies_list_cells($label, $name, $selected_id); + $str = currencies_list_cells($label, $name, $selected_id, $submit_on_change); echo "\n"; return $str; } @@ -1425,10 +1427,7 @@ function bank_account_types_list($name, $selected_id=null) $items = array(); foreach ($types as $type) { - if (payment_person_types::has_items($type['id'])) - { $items[$type['id']] = $type['name']; - } } return array_selector($name, $selected_id, $items );