X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=cd3be97c047a562b874810984867b9a61bf2b0d0;hb=cb27e249917456ac29e41f12a75d359c4fdad977;hp=87526293545838e62b62c1a537926562758194d3;hpb=d567a10b7925c8bb97c734e213d6651a979af29d;p=fa-stable.git diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index 87526293..cd3be97c 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -10,7 +10,6 @@ See the License here . ***********************************************************************/ include_once($path_to_root . "/includes/banking.inc"); -include_once($path_to_root . "/includes/reserved.inc"); include_once($path_to_root . "/includes/types.inc"); include_once($path_to_root . "/includes/current_user.inc"); @@ -20,7 +19,7 @@ $_search_button = " "; -$all_items = reserved_words::get_all(); +$all_items = ALL_TEXT; //---------------------------------------------------------------------------- // Universal sql combo generator @@ -40,26 +39,30 @@ $opts = array( // default options 'spec_id' => 0, // option id // submit on select parameters 'default' => '', // default value when $_POST is not set + 'multi' => false, // multiple select 'select_submit' => false, //submit on select: true/false - 'edit_submit' => false, // call editor on F4 'async' => true, // select update via ajax (true) vs _page_body reload // search box parameters 'sel_hint' => null, 'search_box' => false, // name or true/false 'type' => 0, // type of extended selector: - // 0 - with (optional) visible search box, search by id + // 0 - with (optional) visible search box, search by fragment inside id // 1 - with hidden search box, search by option text - // 2 - TODO reverse: box with hidden selector available via enter; this + // 2 - with (optional) visible search box, search by fragment at the start of id + // 3 - TODO reverse: box with hidden selector available via enter; this // would be convenient for optional ad hoc adding of new item 'search_submit' => true, //search submit button: true/false 'size' => 8, // size and max of box tag 'max' => 50, + 'height' => false, // number of lines in select box 'cells' => false, // combo displayed as 2 cells 'search' => array(), // sql field names to search 'format' => null, // format functions for regular options 'disabled' => false, 'box_hint' => null, // box/selectors hints; null = std see below - 'category' => false // category column name or false + 'category' => false, // category column name or false + 'show_inactive' => false, // show inactive records. + 'editable' => false // false, or length of editable entry field ); // ------ merge options with defaults ---------- if($options != null) @@ -67,14 +70,28 @@ $opts = array( // default options if (!is_array($opts['where'])) $opts['where'] = array($opts['where']); $search_box = $opts['search_box']===true ? '_'.$name.'_edit' : $opts['search_box']; + // select content filtered by search field: $search_submit = $opts['search_submit']===true ? '_'.$name.'_button' : $opts['search_submit']; - $select_submit = $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit']; + // select set by select content field + $search_button = $opts['editable'] ? '_'.$name.'_button' : ($search_box ? $search_submit : false); + + $select_submit = $opts['select_submit']; $spec_id = $opts['spec_id']; $spec_option = $opts['spec_option']; - $by_id = ($opts['type'] == 0); - $class = $by_id ? 'combo':'combo2'; - $disabled = $opts['disabled'] ? "disabled" : ''; + if ($opts['type'] == 0) { + $by_id = true; + $class = 'combo'; + } elseif($opts['type'] == 1) { + $by_id = false; + $class = 'combo2'; + } else { + $by_id = true; + $class = 'combo3'; + } + $disabled = $opts['disabled'] ? "disabled" : ''; + $multi = $opts['multi']; + if(!count($opts['search'])) { $opts['search'] = array($by_id ? $valfield : $namefield); } @@ -88,13 +105,15 @@ $opts = array( // default options : _('Enter description fragment to search or * for all')) :''; if ($selected_id == null) { - $selected_id = get_post($name, $opts['default']); + $selected_id = get_post($name, (string)$opts['default']); } + if(!is_array($selected_id)) + $selected_id = array((string)$selected_id); // code is generalized for multiple selection support + $txt = get_post($search_box); $rel = ''; $limit = ''; - - if (isset($_POST[$select_submit])) { + if (isset($_POST['_'.$name.'_update'])) { // select list or search box change if ($by_id) $txt = $_POST[$name]; if (!$opts['async']) @@ -102,33 +121,41 @@ $opts = array( // default options else $Ajax->activate($name); } - if ($search_box) { - // search related sql modifications - - $rel = "rel='$search_box'"; // set relation to list - if ($opts['search_submit']) { - if (isset($_POST[$search_submit])) { - $selected_id = ''; // ignore selected_id while search + if (isset($_POST[$search_button])) { if (!$opts['async']) $Ajax->activate('_page_body'); else $Ajax->activate($name); } - if ($txt == '') { - if ($spec_option === false && $selected_id==null) - $limit = ' LIMIT 1'; - else - $opts['where'][] = $valfield . "='". get_post($name, $spec_id)."'"; - } - else - if ($txt != '*') { + if ($search_box) { + // search related sql modifications - foreach($opts['search'] as $i=> $s) - $opts['search'][$i] = $s . " LIKE '%{$txt}%'"; - $opts['where'][] = '('. implode($opts['search'], ' OR ') . ')'; + $rel = "rel='$search_box'"; // set relation to list + if ($opts['search_submit']) { + if (isset($_POST[$search_button])) { + $selected_id = array(); // ignore selected_id while search + if (!$opts['async']) + $Ajax->activate('_page_body'); + else + $Ajax->activate($name); + } + if ($txt == '') { + if ($spec_option === false && $selected_id == array()) + $limit = ' LIMIT 1'; + else + $opts['where'][] = $valfield . "=". db_escape(get_post($name, $spec_id)); + } + else + if ($txt != '*') { + + foreach($opts['search'] as $i=> $s) + $opts['search'][$i] = $s . " LIKE " + .db_escape(($class=='combo3' ? '' : '%').$txt.'%'); + $opts['where'][] = '('. implode($opts['search'], ' OR ') . ')'; + } } } - } + // sql completion if (count($opts['where'])) { $where = strpos($sql, 'WHERE')==false ? ' WHERE ':' AND '; @@ -153,31 +180,49 @@ $opts = array( // default options $first_id = false; $found = false; $lastcat = null; -//if($name=='stock_id') display_error($sql); + $edit = false; +//if($name=='stock_id') display_notification('
'.print_r($_POST, true).'
'); +//if($name=='curr_default') display_notification($opts['search_submit']); if($result = db_query($sql)) { while ($contact_row = db_fetch($result)) { $value = $contact_row[0]; $descr = $opts['format']==null ? $contact_row[1] : - call_user_func($opts['format'], $contact_row); + call_user_func($opts['format'], $contact_row); $sel = ''; - if (get_post($search_submit) && ($txt === $value)) { - $selected_id = $value; + if (get_post($search_button) && ($txt == $value)) { + $selected_id[] = $value; } - if ((string)($selected_id) === $value) { + + if (in_array((string)$value, $selected_id, true)) { $sel = 'selected'; $found = $value; + $edit = $opts['editable'] && $contact_row['editable'] + && (@$_POST[$search_box] == $value) + ? $contact_row[1] : false; // get non-formatted description + if ($edit) + break; // selected field is editable - abandon list construction } + // show selected option even if inactive + if (!$opts['show_inactive'] && @$contact_row['inactive'] && $sel==='') { + continue; + } else + $optclass = @$contact_row['inactive'] ? "class='inactive'" : ''; + if ($first_id === false) { $first_id = $value; $first_opt = $descr; } $cat = $contact_row[$opts['category']]; if ($opts['category'] !== false && $cat != $lastcat){ + if ($lastcat!==null) + $selector .= ""; $selector .= "\n"; $lastcat = $cat; } - $selector .= "\n"; + $selector .= "\n"; } + if ($lastcat!==null) + $selector .= ""; db_free_result($result); } @@ -185,39 +230,53 @@ $opts = array( // default options if ($spec_option !== false) { // if special option used - add it $first_id = $spec_id; $first_opt = $spec_option; +// } +// if($first_id !== false) { $sel = $found===false ? 'selected' : ''; - $selector = "\n" + $optclass = @$contact_row['inactive'] ? "class='inactive'" : ''; + $selector = "\n" . $selector; } - if ($found === false) { - $selected_id = $first_id; + if ($found===false) { + $selected_id = array($first_id); } - $_POST[$name] = $selected_id; - - if ($by_id && $search_box != false) { - $txt = $found; + + $_POST[$name] = $multi ? $selected_id : $selected_id[0]; + + $selector = "\n"; + + if ($by_id && ($search_box != false || $opts['editable']) ) { + // on first display show selector list + if (isset($_POST[$search_box]) && $opts['editable'] && $edit) { + $selector = "" + ."\n"; + set_focus($name.'_text'); // prevent lost focus + } else if (get_post($search_submit ? $search_submit : "_{$name}_button")) + set_focus($name); // prevent lost focus + if (!$opts['editable']) + $txt = $found; $Ajax->addUpdate($name, $search_box, $txt ? $txt : ''); } - $aspect = $opts['edit_submit'] ? " aspect='editable'" : ''; - $selector = "\n"; $Ajax->addUpdate($name, "_{$name}_sel", $selector); - // because of bug which M$ cannot fix since IE 5.0 - // we must embed whole selector in span tags to enable proper ajax update + // span for select list/input field update $selector = "".$selector."\n"; - if ($select_submit != false) { // if submit on change is used - add select button + // if selectable or editable list is used - add select button + if ($select_submit != false || $search_button) { global $_select_button; // button class selects form reload/ajax selector update $selector .= sprintf($_select_button, $disabled, user_theme(), (fallback_mode() ? '' : 'display:none;'), - $select_submit)."\n"; + '_'.$name.'_update')."\n"; } // ------ make combo ---------- - $edit_entry = ''; if ($search_box != false) { $edit_entry = "\n"; - if ($search_submit != false) { + if ($search_submit != false || $opts['editable']) { global $_search_button; $edit_entry .= sprintf($_search_button, $disabled, user_theme(), (fallback_mode() ? '' : 'display:none;'), - $search_submit)."\n"; + $search_submit ? $search_submit : "_{$name}_button")."\n"; } } - default_focus($name); - $str = $selector; + default_focus(($search_box && $by_id) ? $search_box : $name); + if ($search_box && $opts['cells']) - echo ($edit_entry!='' ? "$edit_entry" : '')."$selector"; + $str = ($edit_entry!='' ? "$edit_entry" : '')."$selector"; else - echo $edit_entry.$selector; - + $str = $edit_entry.$selector; return $str; } @@ -264,26 +322,30 @@ $opts = array( // default options 'spec_option'=>false, // option text or false 'spec_id' => 0, // option id 'select_submit' => false, //submit on select: true/false - 'edit_submit' => false, // call editor on F4 'async' => true, // select update via ajax (true) vs _page_body reload 'default' => '', // default value when $_POST is not set + 'multi'=>false, // multiple select // search box parameters + 'height' => false, // number of lines in select box 'sel_hint' => null, 'disabled' => false ); // ------ merge options with defaults ---------- if($options != null) $opts = array_merge($opts, $options); - $select_submit = $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit']; + $select_submit = $opts['select_submit']; $spec_id = $opts['spec_id']; $spec_option = $opts['spec_option']; $disabled = $opts['disabled'] ? "disabled" : ''; + $multi = $opts['multi']; if ($selected_id == null) { $selected_id = get_post($name, $opts['default']); } + if(!is_array($selected_id)) + $selected_id = array((string)$selected_id); // code is generalized for multiple selection support - if (isset($_POST[$select_submit])) { + if (isset($_POST[ '_'.$name.'_update'])) { if (!$opts['async']) $Ajax->activate('_page_body'); else @@ -297,7 +359,7 @@ $opts = array( // default options //if($name=='SelectStockFromList') display_error($sql); foreach($items as $value=>$descr) { $sel = ''; - if ($selected_id == $value) { + if (in_array((string)$value, $selected_id, true)) { $sel = 'selected'; $found = $value; } @@ -308,6 +370,9 @@ $opts = array( // default options $selector .= "\n"; } + if ($first_id!==false) { + $sel = ($found===$first_id) || ($found===false && ($spec_option===false)) ? "selected='selected'" : ''; + } // Prepend special option. if ($spec_option !== false) { // if special option used - add it $first_id = $spec_id; @@ -317,13 +382,15 @@ $opts = array( // default options . $selector; } - if ($found === false) { - $_POST[$name] = $first_id; + if ($found===false) { + $selected_id = array($first_id); } + $_POST[$name] = $multi ? $selected_id : $selected_id[0]; - $aspect = $opts['edit_submit'] ? " aspect='editable'" : ''; - $selector = "\n"; + $selector = "\n"; $Ajax->addUpdate($name, "_{$name}_sel", $selector); @@ -333,10 +400,9 @@ $opts = array( // default options global $_select_button; $selector .= sprintf($_select_button, $disabled, user_theme(), (fallback_mode() ? '' : 'display:none;'), - $select_submit)."\n"; + '_'.$name.'_update')."\n"; } default_focus($name); - echo $selector; return $selector; } @@ -354,127 +420,177 @@ function _format_add_curr($row) '' : (" - " . $row[2])); } -function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false) +function add_edit_combo($type) +{ + global $path_to_root, $popup_editors, $use_icon_for_editkey; + + if (!isset($use_icon_for_editkey) || $use_icon_for_editkey==0) + return ""; + // Derive theme path + $theme_path = $path_to_root . '/themes/' . user_theme(); + + $key = $popup_editors[$type][1]; + $onclick = "onclick=\"javascript:callEditor($key); return false;\""; + $img = "Add/Edit"; + return "$img"; +} + +function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, + $all=false, $editkey = false) { global $all_items; - $sql = "SELECT supplier_id, supp_name, curr_code FROM ".TB_PREF."suppliers "; + $sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers "; $mode = get_company_pref('no_supplier_list'); - return combo_input($name, $selected_id, $sql, 'supplier_id', 'supp_name', + if ($editkey) + set_editor('supplier', $name, $editkey); + + $ret = combo_input($name, $selected_id, $sql, 'supplier_id', 'supp_name', array( 'format' => '_format_add_curr', + 'order' => array('supp_ref'), 'search_box' => $mode!=0, - 'edit_submit' => true, 'type' => 1, + 'search' => array("supp_ref","supp_name","gst_no"), 'spec_option' => $spec_option === true ? _("All Suppliers") : $spec_option, 'spec_id' => $all_items, 'select_submit'=> $submit_on_change, 'async' => false, 'sel_hint' => $mode ? _('Press Space tab to filter by name fragment') : - _('Select supplier') + _('Select supplier'), + 'show_inactive'=>$all )); + if ($editkey) + $ret .= add_edit_combo('supplier'); + return $ret; } -function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) +function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, + $submit_on_change=false, $all=false, $editkey = false) { if ($label != null) echo "$label\n"; - $str = supplier_list($name, $selected_id, $all_option, $submit_on_change); + echo supplier_list($name, $selected_id, $all_option, $submit_on_change, + $all, $editkey); echo "\n"; - return $str; } -function supplier_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false) +function supplier_list_row($label, $name, $selected_id=null, $all_option = false, + $submit_on_change=false, $all=false, $editkey = false) { -echo "$label"; - $str = supplier_list($name, $selected_id, $all_option, $submit_on_change ); -echo "\n"; -return $str; + echo "$label"; + echo supplier_list($name, $selected_id, $all_option, $submit_on_change, + $all, $editkey); + echo "\n"; } //---------------------------------------------------------------------------------------------- -function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false) +function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, + $show_inactive=false, $editkey = false) { global $all_items; - $sql = "SELECT debtor_no, name, curr_code FROM ".TB_PREF."debtors_master "; + $sql = "SELECT debtor_no, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master "; $mode = get_company_pref('no_customer_list'); -return combo_input($name, $selected_id, $sql, 'debtor_no', 'name', + if ($editkey) + set_editor('customer', $name, $editkey); + + $ret = combo_input($name, $selected_id, $sql, 'debtor_no', 'debtor_ref', array( 'format' => '_format_add_curr', + 'order' => array('debtor_ref'), 'search_box' => $mode!=0, 'type' => 1, 'size' => 20, + 'search' => array("debtor_ref","name","tax_id"), 'spec_option' => $spec_option === true ? _("All Customers") : $spec_option, 'spec_id' => $all_items, 'select_submit'=> $submit_on_change, - 'edit_submit' => true, // call editor on F4 'async' => false, - 'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F4 - entry new customer') : - _('Select customer') + 'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F2 - entry new customer') : + _('Select customer'), + 'show_inactive' => $show_inactive ) ); + if ($editkey) + $ret .= add_edit_combo('customer'); + return $ret; } -function customer_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) +function customer_list_cells($label, $name, $selected_id=null, $all_option=false, + $submit_on_change=false, $show_inactive=false, $editkey = false) { if ($label != null) echo "$label\n"; echo ""; - $str = customer_list($name, $selected_id, $all_option, $submit_on_change); + echo customer_list($name, $selected_id, $all_option, $submit_on_change, + $show_inactive, $editkey); echo "\n"; - return $str; } -function customer_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false) +function customer_list_row($label, $name, $selected_id=null, $all_option = false, + $submit_on_change=false, $show_inactive=false, $editkey = false) { - echo "$label"; - $str = customer_list($name, $selected_id, $all_option, $submit_on_change); + global $path_to_root; + + echo "$label"; + echo customer_list($name, $selected_id, $all_option, $submit_on_change, + $show_inactive, $editkey); echo "\n\n"; - return $str; } //------------------------------------------------------------------------------------------------ function customer_branches_list($customer_id, $name, $selected_id=null, - $spec_option = true, $enabled=true, $submit_on_change=false) + $spec_option = true, $enabled=true, $submit_on_change=false, $editkey = false) { global $all_items; - $sql = "SELECT branch_code, br_name FROM ".TB_PREF."cust_branch - WHERE debtor_no='" . $customer_id . "' "; + $sql = "SELECT branch_code, branch_ref FROM ".TB_PREF."cust_branch + WHERE debtor_no=" . db_escape($customer_id)." "; + + if ($editkey) + set_editor('branch', $name, $editkey); $where = $enabled ? array("disable_trans = 0") : array(); -return combo_input($name, $selected_id, $sql, 'branch_code', 'br_name', + $ret = combo_input($name, $selected_id, $sql, 'branch_code', 'branch_ref', array( 'where' => $where, + 'order' => array('branch_ref'), 'spec_option' => $spec_option === true ? _('All branches') : $spec_option, 'spec_id' => $all_items, 'select_submit'=> $submit_on_change, 'sel_hint' => _('Select customer branch') ) ); + if ($editkey) + { + $ret .= add_edit_combo('branch'); + } + return $ret; } //------------------------------------------------------------------------------------------------ -function customer_branches_list_cells($label,$customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false) +function customer_branches_list_cells($label,$customer_id, $name, $selected_id=null, + $all_option = true, $enabled=true, $submit_on_change=false, $editkey = false) { if ($label != null) echo "$label\n"; echo ""; - $ret = customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change); + echo customer_branches_list($customer_id, $name, $selected_id, $all_option, $enabled, + $submit_on_change, $editkey); echo "\n"; - return $ret; } -function customer_branches_list_row($label,$customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false) +function customer_branches_list_row($label, $customer_id, $name, $selected_id=null, + $all_option = true, $enabled=true, $submit_on_change=false, $editkey = false) { - echo ""; - $ret = customer_branches_list_cells($label, $customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change); + echo "$label"; + customer_branches_list_cells(null, $customer_id, $name, $selected_id, + $all_option, $enabled, $submit_on_change, $editkey); echo ""; - return $ret; } //------------------------------------------------------------------------------------------------ @@ -483,7 +599,7 @@ function locations_list($name, $selected_id=null, $all_option=false, $submit_on_ { global $all_items; - $sql = "SELECT loc_code, location_name FROM ".TB_PREF."locations"; + $sql = "SELECT loc_code, location_name, inactive FROM ".TB_PREF."locations"; return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name', array( @@ -498,27 +614,24 @@ function locations_list_cells($label, $name, $selected_id=null, $all_option=fals if ($label != null) echo "$label\n"; echo ""; - $str = locations_list($name, $selected_id, $all_option, $submit_on_change); + echo locations_list($name, $selected_id, $all_option, $submit_on_change); echo "\n"; - return $str; } function locations_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) { - echo ""; - $str = locations_list_cells($label, $name, $selected_id, $all_option, $submit_on_change); + echo "$label"; + locations_list_cells(null, $name, $selected_id, $all_option, $submit_on_change); echo "\n"; - return $str; } //----------------------------------------------------------------------------------------------- function currencies_list($name, $selected_id=null, $submit_on_change=false) { - $sql = "SELECT curr_abrev, currency FROM ".TB_PREF."currencies"; + $sql = "SELECT curr_abrev, currency, inactive FROM ".TB_PREF."currencies"; // default to the company currency - return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency', array( 'select_submit'=> $submit_on_change, @@ -532,17 +645,15 @@ function currencies_list_cells($label, $name, $selected_id=null, $submit_on_chan if ($label != null) echo "$label\n"; echo ""; - $str = currencies_list($name, $selected_id, $submit_on_change); + echo currencies_list($name, $selected_id, $submit_on_change); echo "\n"; - return $str; } function currencies_list_row($label, $name, $selected_id=null, $submit_on_change=false) { - echo "\n"; - $str = currencies_list_cells($label, $name, $selected_id, $submit_on_change); + echo "$label"; + currencies_list_cells(null, $name, $selected_id, $submit_on_change); echo "\n"; - return $str; } //--------------------------------------------------------------------------------------------------- @@ -567,7 +678,7 @@ return combo_input($name, $selected_id, $sql, 'id', '', function _format_fiscalyears($row) { return sql2date($row[1]) . " - " . sql2date($row[2]) - . "  " . ($row[3] ? _('Closed') : _('Active')) . "\n"; + . "  " . ($row[3] ? _('Closed') : _('Active')); } function fiscalyears_list_cells($label, $name, $selected_id=null) @@ -575,17 +686,15 @@ function fiscalyears_list_cells($label, $name, $selected_id=null) if ($label != null) echo "$label\n"; echo ""; - $str = fiscalyears_list($name, $selected_id); + echo fiscalyears_list($name, $selected_id); echo "\n"; - return $str; } function fiscalyears_list_row($label, $name, $selected_id=null) { - echo "\n"; - $str = fiscalyears_list_cells($label, $name, $selected_id); + echo "$label"; + fiscalyears_list_cells(null, $name, $selected_id); echo "\n"; - return $str; } //------------------------------------------------------------------------------------ @@ -602,10 +711,10 @@ $options = array( 'async' => false, ); - if ($showclosed) + if (!$showclosed) $options['where'][] = "closed=0"; if($showtype) - $options['where'][] = "type_=$showtype"; + $options['where'][] = "type_=".db_escape($showtype); return combo_input($name, $selected_id, $sql, 'id', 'ref', $options); } @@ -616,31 +725,33 @@ function dimensions_list_cells($label, $name, $selected_id=null, $no_option=fals if ($label != null) echo "$label\n"; echo ""; - $str = dimensions_list($name, $selected_id, $no_option, $showname, $submit_on_change, $showclosed, $showtype); + echo dimensions_list($name, $selected_id, $no_option, $showname, $submit_on_change, $showclosed, $showtype); echo "\n"; - return $str; } function dimensions_list_row($label, $name, $selected_id=null, $no_option=false, $showname=null, $showclosed=false, $showtype=0, $submit_on_change=false) { - echo "\n"; - $str = dimensions_list_cells($label, $name, $selected_id, $no_option, $showname, + echo "$label"; + dimensions_list_cells(null, $name, $selected_id, $no_option, $showname, $showclosed, $showtype, $submit_on_change); echo "\n"; - return $str; } //--------------------------------------------------------------------------------------------------- -function stock_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false, $opts=array()) +function stock_items_list($name, $selected_id=null, $all_option=false, + $submit_on_change=false, $opts=array(), $editkey = false) { global $all_items; - $sql = "SELECT stock_id, s.description, c.description + $sql = "SELECT stock_id, s.description, c.description, s.inactive, s.editable FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id"; - return combo_input($name, $selected_id, $sql, 'stock_id', 's.description', + if ($editkey) + set_editor('item', $name, $editkey); + + $ret = combo_input($name, $selected_id, $sql, 'stock_id', 's.description', array_merge( array( 'format' => '_format_stock_items', @@ -654,6 +765,10 @@ function stock_items_list($name, $selected_id=null, $all_option=false, $submit_o 'category' => 2, 'order' => array('c.description','stock_id') ), $opts) ); + if ($editkey) + $ret .= add_edit_combo('item'); + return $ret; + } function _format_stock_items($row) @@ -661,21 +776,20 @@ function _format_stock_items($row) return (user_show_codes() ? ($row[0] . " - ") : "") . $row[1]; } -function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) +function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, + $submit_on_change=false, $all=false, $editkey = false) { if ($label != null) echo "$label\n"; - $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change, - array('cells'=>true)); - return $str; + echo stock_items_list($name, $selected_id, $all_option, $submit_on_change, + array('cells'=>true, 'show_inactive'=>$all), $editkey); } /* function stock_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) { echo "\n"; - $str = stock_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change); + stock_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change); echo "\n"; - return $str; } */ //--------------------------------------------------------------------------------------------------- @@ -687,19 +801,23 @@ function sales_items_list($name, $selected_id=null, $all_option=false, { global $all_items; // all sales codes - $sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit + $sql = "SELECT i.item_code, i.description, c.description, count(*)>1 as kit, + i.inactive, if(count(*)>1, '0', s.editable) as editable FROM + ".TB_PREF."stock_master s, ".TB_PREF."item_codes i LEFT JOIN ".TB_PREF."stock_category c - ON i.category_id=c.category_id"; + ON i.category_id=c.category_id + WHERE i.stock_id=s.stock_id"; + if ($type == 'local') { // exclude foreign codes - $sql .= " WHERE !i.is_foreign"; + $sql .= " AND !i.is_foreign"; } elseif ($type == 'kits') { // sales kits - $sql .= " WHERE !i.is_foreign AND i.item_code!=i.stock_id"; + $sql .= " AND !i.is_foreign AND i.item_code!=i.stock_id"; } - + $sql .= " AND !i.inactive AND !s.inactive AND !s.no_sale"; $sql .= " GROUP BY i.item_code"; return combo_input($name, $selected_id, $sql, 'i.item_code', 'c.description', @@ -709,96 +827,51 @@ 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", "c.description", "i.description"), 'search_submit' => get_company_pref('no_item_list')!=0, 'size'=>15, 'select_submit'=> $submit_on_change, 'category' => 2, - 'order' => array('c.description','i.item_code') + 'order' => array('c.description','i.item_code'), + 'editable' => 30, + 'max' => 255 ), $opts) ); } -function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) +function sales_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $editkey=false) { + if ($editkey) + set_editor('item', $name, $editkey); + if ($label != null) echo "$label\n"; - $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change, + echo sales_items_list($name, $selected_id, $all_option, $submit_on_change, '', array('cells'=>true)); - return $str; } function sales_kits_list($name, $selected_id=null, $all_option=false, $submit_on_change=false) { - $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change, - 'kits', array('cells'=>false)); - return $str; + return sales_items_list($name, $selected_id, $all_option, $submit_on_change, + 'kits', array('cells'=>false, 'editable' => false)); } function sales_local_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) { echo ""; if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; - $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change, - 'local', array('cells'=>false)); + echo sales_items_list($name, $selected_id, $all_option, $submit_on_change, + 'local', array('cells'=>false, 'editable' => false)); echo ""; - return $str; -} -//------------------------------------------------------------------------------------ - -function base_stock_items_list($where, $name, $selected_id=null, - $all_option=false, $submit_on_change=false) -{ - global $all_items; - - $sql = "SELECT stock_id, s.description, c.description - FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE - s.category_id=c.category_id"; - - return combo_input($name, $selected_id, $sql, 'stock_id', 's.description', - array( - 'format' => '_format_stock_items', - 'spec_option' => $all_option==true ? _("All Items") : $all_option, - 'spec_id' => $all_items, - 'select_submit'=> $submit_on_change, - 'where' => $where, - 'category' => 2 ) ); -} -//------------------------------------------------------------------------------------ - -function stock_bom_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false) -{ - - return base_stock_items_list("(s.mb_flag='M' OR s.mb_flag='K')", - $name, $selected_id, $all_option, $submit_on_change); } -/* -function stock_bom_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) -{ - if ($label != null) - echo "$label\n"; - echo ""; - $str = stock_bom_items_list($name, $selected_id, $all_option, $submit_on_change); - echo "\n"; - return $str; -} - -function stock_bom_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) -{ - echo "\n"; - $str = stock_bom_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change); - echo "\n"; - return $str; -} -*/ //------------------------------------------------------------------------------------ function stock_manufactured_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false) { - return base_stock_items_list("s.mb_flag='M'", - $name, $selected_id, $all_option, $submit_on_change); + return stock_items_list($name, $selected_id, $all_option, $submit_on_change, + array('where'=>array("mb_flag= 'M'"))); } function stock_manufactured_items_list_cells($label, $name, $selected_id=null, @@ -807,48 +880,42 @@ function stock_manufactured_items_list_cells($label, $name, $selected_id=null, if ($label != null) echo "$label\n"; echo ""; - $str = stock_manufactured_items_list($name, $selected_id, $all_option, - $submit_on_change); + echo stock_manufactured_items_list($name, $selected_id, $all_option, $submit_on_change); echo "\n"; - return $str; } function stock_manufactured_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) { - echo "\n"; - $str = stock_manufactured_items_list_cells($label, $name, $selected_id, - $all_option, $submit_on_change); + echo "$label"; + stock_manufactured_items_list_cells(null, $name, $selected_id, $all_option, $submit_on_change); echo "\n"; - return $str; } //------------------------------------------------------------------------------------ function stock_component_items_list($name, $parent_stock_id, $selected_id=null, - $all_option=false, $submit_on_change=false) + $all_option=false, $submit_on_change=false, $editkey = false) { - $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change, - array('where'=>array("stock_id != '$parent_stock_id'"))); - return $str; + return stock_items_list($name, $selected_id, $all_option, $submit_on_change, + array('where'=>array("stock_id != ".db_escape($parent_stock_id))), $editkey); } function stock_component_items_list_cells($label, $name, $parent_stock_id, - $selected_id=null, $all_option=false, $submit_on_change=false) + $selected_id=null, $all_option=false, $submit_on_change=false, $editkey = false) { if ($label != null) echo "$label\n"; - $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change, - array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true)); - return $str; + echo stock_items_list($name, $selected_id, $all_option, $submit_on_change, + array('where'=>array("stock_id != ".db_escape($parent_stock_id)), 'cells'=>true), + $editkey); } //------------------------------------------------------------------------------------ function stock_costable_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false) { - $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change, + return stock_items_list($name, $selected_id, $all_option, $submit_on_change, array('where'=>array("mb_flag!='D'"))); - return $str; } function stock_costable_items_list_cells($label, $name, $selected_id=null, @@ -856,59 +923,53 @@ function stock_costable_items_list_cells($label, $name, $selected_id=null, { if ($label != null) echo "$label\n"; - $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change, + echo stock_items_list($name, $selected_id, $all_option, $submit_on_change, array('where'=>array("mb_flag!='D'"), 'cells'=>true)); - return $str; } //------------------------------------------------------------------------------------ function stock_purchasable_items_list($name, $selected_id=null, - $all_option=false, $submit_on_change=false) + $all_option=false, $submit_on_change=false, $all=false, $editkey=false) { - $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change, + return stock_items_list($name, $selected_id, $all_option, $submit_on_change, array('where'=>array("mb_flag!= 'M'"), - 'edit_submit' => true)); - return $str; + 'show_inactive'=>$all), $editkey); } - +// +// This helper is used in PO/GRN/PI entry and supports editable descriptions. +// function stock_purchasable_items_list_cells($label, $name, $selected_id=null, - $all_option=false, $submit_on_change=false) + $all_option=false, $submit_on_change=false, $editkey=false) { if ($label != null) echo "$label\n"; - $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change, + echo stock_items_list($name, $selected_id, $all_option, $submit_on_change, array('where'=>array("mb_flag!= 'M'"), - 'edit_submit' => true, - 'cells'=>true)); - return $str; + 'editable' => 30, + 'cells'=>true), $editkey); } - +/* function stock_purchasable_items_list_row($label, $name, $selected_id=null, - $all_option=false, $submit_on_change=false) + $all_option=false, $submit_on_change=false, $editkey=false) { - echo "\n"; - $ret = stock_purchasable_items_list_cells($label, $name, $selected_id=null, - $all_option, $submit_on_change); + echo "$label"; + stock_purchasable_items_list_cells(null, $name, $selected_id=null, + $all_option, $submit_on_change, $editkey); echo "\n"; - return $ret; } - +*/ //------------------------------------------------------------------------------------ function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=true) { - $types = array( - 'M' => _("Manufactured"), - 'B' => _("Purchased"), - 'D' => _("Service") - ); + global $stock_types; echo ""; if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; - array_selector($name, $selected_id, $types, + echo array_selector($name, $selected_id, $stock_types, array( 'select_submit'=> true, 'disabled' => !$enabled) ); @@ -920,16 +981,13 @@ function stock_units_list_row($label, $name, $value=null, $enabled=true) $result = get_all_item_units(); echo ""; if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; while($unit = db_fetch($result)) $units[$unit['abbr']] = $unit['name']; - array_selector($name, $value, $units, - array( - 'select_submit'=> true, - 'disabled' => !$enabled) ); + echo array_selector($name, $value, $units, array( 'disabled' => !$enabled) ); echo "\n"; } @@ -943,7 +1001,7 @@ function tax_types_list($name, $selected_id=null, $none_option=false, $submit_on return combo_input($name, $selected_id, $sql, 'id', 'name', array( 'spec_option' => $none_option, - 'spec_id' => reserved_words::get_all_numeric(), + 'spec_id' => ALL_NUMERIC, 'select_submit'=> $submit_on_change, 'async' => false, ) ); @@ -955,18 +1013,16 @@ function tax_types_list_cells($label, $name, $selected_id=null, $none_option=fal if ($label != null) echo "$label\n"; echo ""; - $str = tax_types_list($name, $selected_id, $none_option, $submit_on_change); + echo tax_types_list($name, $selected_id, $none_option, $submit_on_change); echo "\n"; - return $str; } function tax_types_list_row($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false) { - echo "\n"; - $str = tax_types_list_cells($label, $name, $selected_id, $none_option, $submit_on_change); + echo "$label"; + tax_types_list_cells(null, $name, $selected_id, $none_option, $submit_on_change); echo "\n"; - return $str; } //------------------------------------------------------------------------------------ @@ -980,7 +1036,7 @@ function tax_groups_list($name, $selected_id=null, array( 'order' => 'id', 'spec_option' => $none_option, - 'spec_id' => reserved_words::get_all_numeric(), + 'spec_id' => ALL_NUMERIC, 'select_submit'=> $submit_on_change, 'async' => false, ) ); @@ -991,17 +1047,15 @@ function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=fa if ($label != null) echo "$label\n"; echo ""; - $str = tax_groups_list($name, $selected_id, $none_option, $submit_on_change); + echo tax_groups_list($name, $selected_id, $none_option, $submit_on_change); echo "\n"; - return $str; } function tax_groups_list_row($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false) { - echo "\n"; - $str = tax_groups_list_cells($label, $name, $selected_id, $none_option, $submit_on_change); + echo "$label"; + tax_groups_list_cells(null, $name, $selected_id, $none_option, $submit_on_change); echo "\n"; - return $str; } //------------------------------------------------------------------------------------ @@ -1009,7 +1063,7 @@ function tax_groups_list_row($label, $name, $selected_id=null, $none_option=fals function item_tax_types_list($name, $selected_id=null) { $sql ="SELECT id, name FROM ".TB_PREF."item_tax_types"; - combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') ); + return combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') ); } function item_tax_types_list_cells($label, $name, $selected_id=null) @@ -1017,14 +1071,14 @@ function item_tax_types_list_cells($label, $name, $selected_id=null) if ($label != null) echo "$label\n"; echo ""; - item_tax_types_list($name, $selected_id); + echo item_tax_types_list($name, $selected_id); echo "\n"; } function item_tax_types_list_row($label, $name, $selected_id=null) { - echo "\n"; - item_tax_types_list_cells($label, $name, $selected_id); + echo "$label"; + item_tax_types_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1032,8 +1086,9 @@ function item_tax_types_list_row($label, $name, $selected_id=null) function shippers_list($name, $selected_id=null) { - $sql = "SELECT shipper_id, shipper_name FROM ".TB_PREF."shippers"; - combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', array()); + $sql = "SELECT shipper_id, shipper_name, inactive FROM ".TB_PREF."shippers"; + return combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', + array('order'=>array('shipper_name'))); } function shippers_list_cells($label, $name, $selected_id=null) @@ -1041,38 +1096,41 @@ function shippers_list_cells($label, $name, $selected_id=null) if ($label != null) echo "$label\n"; echo ""; - shippers_list($name, $selected_id); + echo shippers_list($name, $selected_id); echo "\n"; } function shippers_list_row($label, $name, $selected_id=null) { - echo "\n"; - shippers_list_cells($label, $name, $selected_id); + echo "$label"; + shippers_list_cells(null, $name, $selected_id); echo "\n"; } //------------------------------------------------------------------------------------- -function sales_persons_list($name, $selected_id=null) +function sales_persons_list($name, $selected_id=null, $spec_opt=false) { - $sql = "SELECT salesman_code, salesman_name FROM ".TB_PREF."salesman"; - combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', array()); + $sql = "SELECT salesman_code, salesman_name, inactive FROM ".TB_PREF."salesman"; + return combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', + array('order'=>array('salesman_name'), + 'spec_option' => $spec_opt, + 'spec_id' => ALL_NUMERIC)); } -function sales_persons_list_cells($label, $name, $selected_id=null) +function sales_persons_list_cells($label, $name, $selected_id=null, $spec_opt=false) { if ($label != null) echo "$label\n"; echo "\n"; - sales_persons_list($name, $selected_id); + echo sales_persons_list($name, $selected_id, $spec_opt); echo "\n"; } -function sales_persons_list_row($label, $name, $selected_id=null, $submit_on_change=false) +function sales_persons_list_row($label, $name, $selected_id=null, $spec_opt=false) { - echo "\n"; - sales_persons_list_cells($label, $name, $selected_id, $submit_on_change=false); + echo "$label"; + sales_persons_list_cells(null, $name, $selected_id, $spec_opt); echo "\n"; } @@ -1080,8 +1138,8 @@ function sales_persons_list_row($label, $name, $selected_id=null, $submit_on_cha function sales_areas_list($name, $selected_id=null) { - $sql = "SELECT area_code, description FROM ".TB_PREF."areas"; - combo_input($name, $selected_id, $sql, 'area_code', 'description', array()); + $sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas"; + return combo_input($name, $selected_id, $sql, 'area_code', 'description', array()); } function sales_areas_list_cells($label, $name, $selected_id=null) @@ -1089,14 +1147,14 @@ function sales_areas_list_cells($label, $name, $selected_id=null) if ($label != null) echo "$label\n"; echo ""; - sales_areas_list($name, $selected_id); + echo sales_areas_list($name, $selected_id); echo "\n"; } function sales_areas_list_row($label, $name, $selected_id=null) { - echo "\n"; - sales_areas_list_cells($label, $name, $selected_id); + echo "$label"; + sales_areas_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1104,8 +1162,8 @@ function sales_areas_list_row($label, $name, $selected_id=null) function sales_groups_list($name, $selected_id=null, $special_option=false) { - $sql = "SELECT id, description FROM ".TB_PREF."groups"; - combo_input($name, $selected_id, $sql, 'id', 'description', array( + $sql = "SELECT id, description, inactive FROM ".TB_PREF."groups"; + return combo_input($name, $selected_id, $sql, 'id', 'description', array( 'spec_option' => $special_option===true ? ' ' : $special_option, 'order' => 'description', 'spec_id' => 0, )); @@ -1116,14 +1174,14 @@ function sales_groups_list_cells($label, $name, $selected_id=null, $special_opti if ($label != null) echo "$label\n"; echo ""; - sales_groups_list($name, $selected_id, $special_option); + echo sales_groups_list($name, $selected_id, $special_option); echo "\n"; } function sales_groups_list_row($label, $name, $selected_id=null, $special_option=false) { - echo "\n"; - sales_groups_list_cells($label, $name, $selected_id, $special_option); + echo "$label"; + sales_groups_list_cells(null, $name, $selected_id, $special_option); echo "\n"; } @@ -1139,7 +1197,7 @@ function templates_list($name, $selected_id=null, $special_option=false) $sql = "SELECT sorder.order_no, Sum(line.unit_price*line.quantity*(1-line.discount_percent)) AS OrderValue FROM ".TB_PREF."sales_orders as sorder, ".TB_PREF."sales_order_details as line WHERE sorder.order_no = line.order_no AND sorder.type = 1 GROUP BY line.order_no"; - combo_input($name, $selected_id, $sql, 'order_no', 'OrderValue', array( + return combo_input($name, $selected_id, $sql, 'order_no', 'OrderValue', array( 'format' => '_format_template_items', 'spec_option' => $special_option===true ? ' ' : $special_option, 'order' => 'order_no', 'spec_id' => 0, @@ -1151,14 +1209,14 @@ function templates_list_cells($label, $name, $selected_id=null, $special_option= if ($label != null) echo "$label\n"; echo ""; - templates_list($name, $selected_id, $special_option); + echo templates_list($name, $selected_id, $special_option); echo "\n"; } function templates_list_row($label, $name, $selected_id=null, $special_option=false) { - echo "\n"; - templates_list_cells($label, $name, $selected_id, $special_option); + echo "$label"; + templates_list_cells(null, $name, $selected_id, $special_option); echo "\n"; } @@ -1167,7 +1225,7 @@ function templates_list_row($label, $name, $selected_id=null, $special_option=fa function workorders_list($name, $selected_id=null) { $sql = "SELECT id, wo_ref FROM ".TB_PREF."workorders WHERE closed=0"; - combo_input($name, $selected_id, $sql, 'id', 'wo_ref', array()); + return combo_input($name, $selected_id, $sql, 'id', 'wo_ref', array()); } function workorders_list_cells($label, $name, $selected_id=null) @@ -1175,14 +1233,14 @@ function workorders_list_cells($label, $name, $selected_id=null) if ($label != null) echo "$label\n"; echo ""; - workorders_list($name, $selected_id); + echo workorders_list($name, $selected_id); echo "\n"; } function workorders_list_row($label, $name, $selected_id=null) { - echo "\n"; - workorders_list_cells($label, $name, $selected_id); + echo "$label"; + workorders_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1190,8 +1248,8 @@ function workorders_list_row($label, $name, $selected_id=null) function payment_terms_list($name, $selected_id=null) { - $sql = "SELECT terms_indicator, terms FROM ".TB_PREF."payment_terms"; - combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array()); + $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms"; + return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array()); } function payment_terms_list_cells($label, $name, $selected_id=null) @@ -1199,14 +1257,14 @@ function payment_terms_list_cells($label, $name, $selected_id=null) if ($label != null) echo "$label\n"; echo ""; - payment_terms_list($name, $selected_id); + echo payment_terms_list($name, $selected_id); echo "\n"; } function payment_terms_list_row($label, $name, $selected_id=null) { - echo "\n"; - payment_terms_list_cells($label, $name, $selected_id); + echo "$label"; + payment_terms_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1214,8 +1272,8 @@ function payment_terms_list_row($label, $name, $selected_id=null) function credit_status_list($name, $selected_id=null) { - $sql ="SELECT id, reason_description FROM ".TB_PREF."credit_status"; - combo_input($name, $selected_id, $sql, 'id', 'reason_description', array()); + $sql ="SELECT id, reason_description, inactive FROM ".TB_PREF."credit_status"; + return combo_input($name, $selected_id, $sql, 'id', 'reason_description', array()); } function credit_status_list_cells($label, $name, $selected_id=null) @@ -1223,14 +1281,14 @@ function credit_status_list_cells($label, $name, $selected_id=null) if ($label != null) echo "$label\n"; echo ""; - credit_status_list($name, $selected_id); + echo credit_status_list($name, $selected_id); echo "\n"; } function credit_status_list_row($label, $name, $selected_id=null) { - echo "\n"; - credit_status_list_cells($label, $name, $selected_id); + echo "$label"; + credit_status_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1238,7 +1296,7 @@ function credit_status_list_row($label, $name, $selected_id=null) function sales_types_list($name, $selected_id=null, $submit_on_change=false, $special_option=false) { - $sql = "SELECT id, sales_type FROM ".TB_PREF."sales_types"; + $sql = "SELECT id, sales_type, inactive FROM ".TB_PREF."sales_types"; return combo_input($name, $selected_id, $sql, 'id', 'sales_type', array( @@ -1254,17 +1312,15 @@ function sales_types_list_cells($label, $name, $selected_id=null, $submit_on_cha if ($label != null) echo "$label\n"; echo ""; - $str = sales_types_list($name, $selected_id, $submit_on_change, $special_option); + echo sales_types_list($name, $selected_id, $submit_on_change, $special_option); echo "\n"; - return $str; } function sales_types_list_row($label, $name, $selected_id=null, $submit_on_change=false, $special_option=false) { - echo "\n"; - $str = sales_types_list_cells($label, $name, $selected_id, $submit_on_change, $special_option); + echo "$label"; + sales_types_list_cells(null, $name, $selected_id, $submit_on_change, $special_option); echo "\n"; - return $str; } //----------------------------------------------------------------------------------------------- @@ -1272,7 +1328,7 @@ function sales_types_list_row($label, $name, $selected_id=null, $submit_on_chang function movement_types_list($name, $selected_id=null) { $sql = "SELECT id, name FROM ".TB_PREF."movement_types"; - combo_input($name, $selected_id, $sql, 'id', 'name', array()); + return combo_input($name, $selected_id, $sql, 'id', 'name', array()); } function movement_types_list_cells($label, $name, $selected_id=null) @@ -1280,14 +1336,14 @@ function movement_types_list_cells($label, $name, $selected_id=null) if ($label != null) echo "$label\n"; echo ""; - movement_types_list($name, $selected_id); + echo movement_types_list($name, $selected_id); echo "\n"; } function movement_types_list_row($label, $name, $selected_id=null) { - echo "\n"; - movement_types_list_cells($label, $name, $selected_id); + echo "$label"; + movement_types_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1302,7 +1358,7 @@ function bank_reconciliation_list($account, $name, $selected_id=null, $submit_on $sql = "SELECT reconciled, reconciled FROM ".TB_PREF."bank_trans WHERE bank_act=".db_escape($account)." AND reconciled IS NOT NULL GROUP BY reconciled"; - combo_input($name, $selected_id, $sql, 'id', 'reconciled', + return combo_input($name, $selected_id, $sql, 'id', 'reconciled', array( 'spec_option' => $special_option, 'format' => '_format_date', @@ -1316,7 +1372,7 @@ function bank_reconciliation_list_cells($label,$account, $name, $selected_id=nul if ($label != null) echo "$label\n"; echo ""; - bank_reconciliation_list($account, $name, $selected_id, $submit_on_change, $special_option); + echo bank_reconciliation_list($account, $name, $selected_id, $submit_on_change, $special_option); echo "\n"; } /* @@ -1333,7 +1389,7 @@ function workcenter_list($name, $selected_id=null, $all_option=false) { global $all_items; - $sql = "SELECT id, name FROM ".TB_PREF."workcentres"; + $sql = "SELECT id, name, inactive FROM ".TB_PREF."workcentres"; return combo_input($name, $selected_id, $sql, 'id', 'name', array( @@ -1348,30 +1404,30 @@ function workcenter_list_cells($label, $name, $selected_id=null, $all_option=fal if ($label != null) echo "$label\n"; echo ""; - workcenter_list($name, $selected_id, $all_option); + echo workcenter_list($name, $selected_id, $all_option); echo "\n"; } function workcenter_list_row($label, $name, $selected_id=null, $all_option=false) { - echo "\n"; - workcenter_list_cells($label, $name, $selected_id, $all_option); + echo "$label"; + workcenter_list_cells(null, $name, $selected_id, $all_option); echo "\n"; } //----------------------------------------------------------------------------------------------- -function bank_accounts_list($name, $selected_id=null, $submit_on_change=false) +function bank_accounts_list($name, $selected_id=null, $submit_on_change=false, $spec_option=false) { - $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code + $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive FROM ".TB_PREF."bank_accounts"; -// , ".TB_PREF."chart_master -// WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code"; return combo_input($name, $selected_id, $sql, 'id', 'bank_account_name', array( 'format' => '_format_add_curr', 'select_submit'=> $submit_on_change, + 'spec_option' => $spec_option, + 'spec_id' => '', 'async' => false ) ); } @@ -1381,71 +1437,87 @@ function bank_accounts_list_cells($label, $name, $selected_id=null, $submit_on_c if ($label != null) echo "$label\n"; echo ""; - $str = bank_accounts_list($name, $selected_id, $submit_on_change); + echo bank_accounts_list($name, $selected_id, $submit_on_change); echo "\n"; - return $str; } function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false) { - echo "\n"; - $str = bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change); + echo "$label"; + bank_accounts_list_cells(null, $name, $selected_id, $submit_on_change); echo "\n"; - return $str; } //----------------------------------------------------------------------------------------------- function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false) { - $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code + $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive FROM ".TB_PREF."bank_accounts - WHERE ".TB_PREF."bank_accounts.account_type=3"; + WHERE ".TB_PREF."bank_accounts.account_type=".BT_CASH; if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; - $str = combo_input($name, $selected_id, $sql, 'id', 'bank_account_name', + echo combo_input($name, $selected_id, $sql, 'id', 'bank_account_name', array( 'format' => '_format_add_curr', 'select_submit'=> $submit_on_change, 'async' => true ) ); echo "\n"; - return $str; } //----------------------------------------------------------------------------------------------- function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $submit_on_change=false) { - $sql = "SELECT id, pos_name FROM ".TB_PREF."sales_pos"; + $sql = "SELECT id, pos_name, inactive FROM ".TB_PREF."sales_pos"; default_focus($name); echo ''; if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; - $str = combo_input($name, $selected_id, $sql, 'id', 'pos_name', + echo combo_input($name, $selected_id, $sql, 'id', 'pos_name', array( 'select_submit'=> $submit_on_change, 'async' => true, 'spec_option' =>$spec_option, 'spec_id' => -1, + 'order'=> array('pos_name') ) ); echo "\n"; - return $str; } //----------------------------------------------------------------------------------------------- +// Payment type selector for current user. +// +function sale_payment_list($name, $category, $selected_id=null, $submit_on_change=true) +{ + $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms"; + + if ($category == PM_CASH) // only cash + $sql .= " WHERE days_before_due=0 AND day_in_following_month=0"; + if ($category == PM_CREDIT) // only delayed payments + $sql .= " WHERE days_before_due!=0 OR day_in_following_month!=0"; -function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=false) + return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', + array( + 'select_submit'=> $submit_on_change, + 'async' => true + ) ); + +} + +function sale_payment_list_cells($label, $name, $category, $selected_id=null, $submit_on_change=true) { if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; - $str = yesno_list($name, $selected_id, _('Cash'), _('Delayed'), $submit_on_change); + + echo sale_payment_list($name, $category, $selected_id, $submit_on_change); + echo "\n"; - return $str; } //----------------------------------------------------------------------------------------------- @@ -1466,101 +1538,103 @@ function class_list_cells($label, $name, $selected_id=null, $submit_on_change=fa if ($label != null) echo "$label\n"; echo ""; - $str = class_list($name, $selected_id, $submit_on_change); + echo class_list($name, $selected_id, $submit_on_change); echo "\n"; - return $str; } function class_list_row($label, $name, $selected_id=null, $submit_on_change=false) { - echo "\n"; - $str = class_list_cells($label, $name, $selected_id, $submit_on_change); + echo "$label"; + class_list_cells(null, $name, $selected_id, $submit_on_change); echo "\n"; - return $str; } //----------------------------------------------------------------------------------------------- - -function stock_categories_list($name, $selected_id=null) +function stock_categories_list($name, $selected_id=null, $spec_opt=false, $submit_on_change=false) { - $sql = "SELECT category_id, description FROM ".TB_PREF."stock_category"; - combo_input($name, $selected_id, $sql, 'category_id', 'description', - array('order'=>'category_id')); + $sql = "SELECT category_id, description, inactive FROM ".TB_PREF."stock_category"; + return combo_input($name, $selected_id, $sql, 'category_id', 'description', + array('order'=>'category_id', + 'spec_option' => $spec_opt, + 'spec_id' => -1, + 'select_submit'=> $submit_on_change, + 'async' => true + )); } -function stock_categories_list_cells($label, $name, $selected_id=null) +function stock_categories_list_cells($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false) { if ($label != null) echo "$label\n"; echo ""; - stock_categories_list($name, $selected_id); + echo stock_categories_list($name, $selected_id, $spec_opt, $submit_on_change); echo "\n"; } -function stock_categories_list_row($label, $name, $selected_id=null) +function stock_categories_list_row($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false) { - echo "\n"; - stock_categories_list_cells($label, $name, $selected_id); + echo "$label"; + stock_categories_list_cells(null, $name, $selected_id, $spec_opt, $submit_on_change); echo "\n"; } //----------------------------------------------------------------------------------------------- -function gl_account_types_list($name, $selected_id=null, $all_option, $all_option_numeric) +function gl_account_types_list($name, $selected_id=null, $all_option=false, $all=true) { global $all_items; $sql = "SELECT id, name FROM ".TB_PREF."chart_types"; - combo_input($name, $selected_id, $sql, 'id', 'name', + return combo_input($name, $selected_id, $sql, 'id', 'name', array( - 'order' => 'id', + 'format' => '_format_account', + 'order' => array('class_id', 'id', 'parent'), 'spec_option' =>$all_option, - 'spec_id' => $all_option_numeric ? 0 : $all_items + 'spec_id' => $all_items ) ); } -function gl_account_types_list_cells($label, $name, $selected_id=null, $all_option=false, - $all_option_numeric=false) +function gl_account_types_list_cells($label, $name, $selected_id=null, $all_option=false, $all=false) { if ($label != null) echo "$label\n"; echo ""; - gl_account_types_list($name, $selected_id, $all_option, $all_option_numeric); + echo gl_account_types_list($name, $selected_id, $all_option, $all); echo "\n"; } -function gl_account_types_list_row($label, $name, $selected_id=null, $all_option=false, - $all_option_numeric=false) +function gl_account_types_list_row($label, $name, $selected_id=null, $all_option=false, $all=false) { - echo "\n"; - gl_account_types_list_cells($label, $name, $selected_id, $all_option, - $all_option_numeric); + echo "$label"; + gl_account_types_list_cells(null, $name, $selected_id, $all_option, + $all); echo "\n"; } //----------------------------------------------------------------------------------------------- function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=false, - $cells=false, $all_option=false, $submit_on_change=false) + $cells=false, $all_option=false, $submit_on_change=false, $all=false) { if ($skip_bank_accounts) - $sql = "SELECT chart.account_code, chart.account_name, type.name + $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id FROM (".TB_PREF."chart_master chart,".TB_PREF."chart_types type) " ."LEFT JOIN ".TB_PREF."bank_accounts acc " ."ON chart.account_code=acc.account_code WHERE acc.account_code IS NULL AND chart.account_type=type.id"; else - $sql = "SELECT chart.account_code, chart.account_name, type.name + $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type WHERE chart.account_type=type.id"; - combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name', + return combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name', array( 'format' => '_format_account', 'spec_option' => $all_option===true ? _("Use Item Sales Accounts") : $all_option, 'spec_id' => '', - 'order' => array('name','account_code'), + 'type' => 2, + 'order' => array('type.class_id','type.id','account_code'), 'search_box' => $cells, 'search_submit' => false, 'size' => 12, @@ -1568,7 +1642,8 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals 'cells' => true, 'select_submit'=> $submit_on_change, 'async' => false, - 'category' => 2 + 'category' => 2, + 'show_inactive' => $all ) ); } @@ -1579,21 +1654,22 @@ function _format_account($row) } function gl_all_accounts_list_cells($label, $name, $selected_id=null, - $skip_bank_accounts=false, $cells=false, $all_option=false) + $skip_bank_accounts=false, $cells=false, $all_option=false, + $submit_on_change=false, $all=false) { if ($label != null) echo "$label\n"; echo ""; - gl_all_accounts_list($name, $selected_id, - $skip_bank_accounts, $cells, $all_option); + echo gl_all_accounts_list($name, $selected_id, + $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all); echo "\n"; } function gl_all_accounts_list_row($label, $name, $selected_id=null, $skip_bank_accounts=false, $cells=false, $all_option=false) { - echo "\n"; - gl_all_accounts_list_cells($label, $name, $selected_id, + echo "$label"; + gl_all_accounts_list_cells(null, $name, $selected_id, $skip_bank_accounts, $cells, $all_option); echo "\n"; } @@ -1601,8 +1677,8 @@ function gl_all_accounts_list_row($label, $name, $selected_id=null, function yesno_list($name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false) { $items = array(); - $items['1'] = strlen($name_yes) ? $name_yes : _("Yes"); $items['0'] = strlen($name_no) ? $name_no : _("No"); + $items['1'] = strlen($name_yes) ? $name_yes : _("Yes"); return array_selector($name, $selected_id, $items, array( @@ -1615,45 +1691,44 @@ function yesno_list_cells($label, $name, $selected_id=null, $name_yes="", $name_ if ($label != null) echo "$label\n"; echo ""; - $str = yesno_list($name, $selected_id, $name_yes, $name_no, $submit_on_change); + echo yesno_list($name, $selected_id, $name_yes, $name_no, $submit_on_change); echo "\n"; - return $str; } function yesno_list_row($label, $name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false) { - echo "\n"; - $str = yesno_list_cells($label, $name, $selected_id, $name_yes, $name_no, $submit_on_change); + echo "$label"; + yesno_list_cells(null, $name, $selected_id, $name_yes, $name_no, $submit_on_change); echo "\n"; - return $str; } //------------------------------------------------------------------------------------------------ -function languages_list($name, $selected_id=null) +function languages_list($name, $selected_id=null, $all_option=false) { global $installed_languages; $items = array(); + if ($all_option) + $items[''] = $all_option; foreach ($installed_languages as $lang) $items[$lang['code']] = $lang['name']; - - return array_selector($name, $selected_id, $items ); + return array_selector($name, $selected_id, $items); } -function languages_list_cells($label, $name, $selected_id=null) +function languages_list_cells($label, $name, $selected_id=null, $all_option=false) { if ($label != null) echo "$label\n"; echo ""; - languages_list($name, $selected_id); + echo languages_list($name, $selected_id, $all_option); echo "\n"; } -function languages_list_row($label, $name, $selected_id=null) +function languages_list_row($label, $name, $selected_id=null, $all_option=false) { - echo "\n"; - languages_list_cells($label, $name, $selected_id); + echo "$label"; + languages_list_cells(null, $name, $selected_id, $all_option); echo "\n"; } @@ -1661,15 +1736,9 @@ function languages_list_row($label, $name, $selected_id=null) function bank_account_types_list($name, $selected_id=null) { - $types = bank_account_types::get_all(); + global $bank_account_types; - $items = array(); - foreach ($types as $type) - { - $items[$type['id']] = $type['name']; - } - - return array_selector($name, $selected_id, $items ); + return array_selector($name, $selected_id, $bank_account_types); } function bank_account_types_list_cells($label, $name, $selected_id=null) @@ -1677,31 +1746,28 @@ function bank_account_types_list_cells($label, $name, $selected_id=null) if ($label != null) echo "$label\n"; echo ""; - bank_account_types_list($name, $selected_id); + echo bank_account_types_list($name, $selected_id); echo "\n"; } function bank_account_types_list_row($label, $name, $selected_id=null) { - echo "\n"; - bank_account_types_list_cells($label, $name, $selected_id); + echo "$label"; + bank_account_types_list_cells(null, $name, $selected_id); echo "\n"; } //------------------------------------------------------------------------------------------------ function payment_person_types_list($name, $selected_id=null, $submit_on_change=false) { - $types = payment_person_types::get_all(); + global $payment_person_types; $items = array(); - foreach ($types as $type) + foreach ($payment_person_types as $key=>$type) { - if (payment_person_types::has_items($type['id'])) - { - $items[$type['id']] = $type['name']; - } - } - + if ($key != PT_WORKORDER) + $items[$key] = $type; + } return array_selector($name, $selected_id, $items, array( 'select_submit'=> $submit_on_change ) ); } @@ -1711,39 +1777,32 @@ function payment_person_types_list_cells($label, $name, $selected_id=null, $rela if ($label != null) echo "$label\n"; echo ""; - $str = payment_person_types_list($name, $selected_id, $related); + echo payment_person_types_list($name, $selected_id, $related); echo "\n"; - return $str; } function payment_person_types_list_row($label, $name, $selected_id=null, $related=null) { - echo "\n"; - $str = payment_person_types_list_cells($label, $name, $selected_id, $related); + echo "$label"; + payment_person_types_list_cells(null, $name, $selected_id, $related); echo "\n"; - return $str; } //------------------------------------------------------------------------------------------------ function wo_types_list($name, $selected_id=null) { - $types = wo_types::get_all(); - - $items = array(); - foreach ($types as $type) - $items[$type['id']] = $type['name']; + global $wo_types_array; - return array_selector($name, $selected_id, $items, + return array_selector($name, $selected_id, $wo_types_array, array( 'select_submit'=> true, 'async' => true ) ); } function wo_types_list_row($label, $name, $selected_id=null) { - echo "$label\n"; - $str = wo_types_list($name, $selected_id); + echo "$label\n"; + echo wo_types_list($name, $selected_id); echo "\n"; - return $str; } //------------------------------------------------------------------------------------------------ @@ -1752,8 +1811,8 @@ function dateformats_list_row($label, $name, $value=null) { global $dateformats; - echo "$label\n"; - array_selector( $name, $value, $dateformats ); + echo "$label\n"; + echo array_selector( $name, $value, $dateformats ); echo "\n"; } @@ -1761,8 +1820,8 @@ function dateseps_list_row($label, $name, $value=null) { global $dateseps; - echo "$label\n"; - array_selector( $name, $value, $dateseps ); + echo "$label\n"; + echo array_selector( $name, $value, $dateseps ); echo "\n"; } @@ -1770,8 +1829,8 @@ function thoseps_list_row($label, $name, $value=null) { global $thoseps; - echo "$label\n"; - array_selector( $name, $value, $thoseps ); + echo "$label\n"; + echo array_selector( $name, $value, $thoseps ); echo "\n"; } @@ -1779,8 +1838,8 @@ function decseps_list_row($label, $name, $value=null) { global $decseps; - echo "$label\n"; - array_selector( $name, $value, $decseps ); + echo "$label\n"; + echo array_selector( $name, $value, $decseps ); echo "\n"; } @@ -1800,8 +1859,8 @@ function themes_list_row($label, $name, $value=null) } ksort($themes); - echo "$label\n"; - array_selector( $name, $value, $themes ); + echo "$label\n"; + echo array_selector( $name, $value, $themes ); echo "\n"; } @@ -1813,21 +1872,44 @@ function pagesizes_list_row($label, $name, $value=null) foreach ($pagesizes as $pz) $items[$pz] = $pz; - echo "$label\n"; - array_selector( $name, $value, $items ); + echo "$label\n"; + echo array_selector( $name, $value, $items ); echo "\n"; } -function security_headings_list_row($label, $name, $value=null) +function systypes_list($name, $value=null, $spec_opt=false, $submit_on_change=false, $exclude=array()) { - global $security_headings; + global $systypes_array; - echo "$label\n"; - array_selector( $name, $value, $security_headings ); - echo "\n"; + // emove non-voidable transactions if needed + $systypes = array_diff_key($systypes_array, array_flip($exclude)); + return array_selector($name, $value, $systypes, + array( + 'spec_option'=> $spec_opt, + 'spec_id' => ALL_NUMERIC, + 'select_submit'=> $submit_on_change, + 'async' => false, + ) + ); } -function systypes_list_cells($label, $name, $value=null, $submit_on_change=false) +function systypes_list_cells($label, $name, $value=null, $submit_on_change=false, $exclude=array()) +{ + if ($label != null) + echo "$label\n"; + echo ""; + echo systypes_list($name, $value, false, $submit_on_change, $exclude); + echo "\n"; +} + +function systypes_list_row($label, $name, $value=null, $submit_on_change=false, $exclude=array()) +{ + echo "$label"; + systypes_list_cells(null, $name, $value, $submit_on_change, $exclude); + echo "\n"; +} + +function journal_types_list_cells($label, $name, $value=null, $submit_on_change=false) { global $systypes_array; @@ -1835,26 +1917,21 @@ function systypes_list_cells($label, $name, $value=null, $submit_on_change=false echo "$label\n"; echo ""; - $items = array(); - foreach ($systypes_array as $key=>$type) - $items[$key] = $type['name']; + $items = $systypes_array; + + // exclude quotes, orders and dimensions + foreach (array(ST_PURCHORDER, ST_SALESORDER, ST_DIMENSION, ST_SALESQUOTE, ST_LOCTRANSFER) as $excl) + unset($items[$excl]); - $str = array_selector($name, $value, $items, + echo array_selector($name, $value, $items, array( + 'spec_option'=> _("All"), + 'spec_id' => -1, 'select_submit'=> $submit_on_change, 'async' => false ) ); echo "\n"; - return $str; -} - -function systypes_list_row($label, $name, $value=null, $submit_on_change=false) -{ - echo "\n"; - $str = systypes_list_cells($label, $name, $value, $submit_on_change); - echo "\n"; - return $str; } function cust_allocations_list_cells($label, $name, $selected=null) @@ -1872,9 +1949,8 @@ function cust_allocations_list_cells($label, $name, $selected=null) '4' => _("Credit Notes"), '5' => _("Delivery Notes") ); - $str = array_selector($name, $selected, $allocs); + echo array_selector($name, $selected, $allocs); echo "\n"; - return $str; } function supp_allocations_list_cell($name, $selected=null) @@ -1890,9 +1966,27 @@ function supp_allocations_list_cell($name, $selected=null) '4' => _("Credit Notes"), '5' => _("Overdue Credit Notes") ); - $str = array_selector($name, $selected, $allocs); + echo array_selector($name, $selected, $allocs); + echo "\n"; +} + +function supp_transactions_list_cell($name, $selected=null) +{ + global $all_items; + + echo "\n"; + $allocs = array( + $all_items=>_("All Types"), + '6'=>_("GRNs"), + '1'=> _("Invoices"), + '2'=> _("Overdue Invoices"), + '3' => _("Payments"), + '4' => _("Credit Notes"), + '5' => _("Overdue Credit Notes") + ); + + echo array_selector($name, $selected, $allocs); echo "\n"; - return $str; } function policy_list_cells($label, $name, $selected=null) @@ -1900,17 +1994,16 @@ function policy_list_cells($label, $name, $selected=null) if ($label != null) label_cell($label); echo "\n"; - $str = array_selector($name, $selected, + echo array_selector($name, $selected, array( '' => _("Automatically put balance on back order"), 'CAN' => _("Cancel any quantites not delivered")) ); echo "\n"; - return $str; } function policy_list_row($label, $name, $selected=null) { - echo "\n"; - policy_list_cells($label, $name, $selected); + echo "$label"; + policy_list_cells(null, $name, $selected); echo "\n"; } @@ -1919,20 +2012,18 @@ function credit_type_list_cells($label, $name, $selected=null, $submit_on_change if ($label != null) label_cell($label); echo "\n"; - $str = array_selector($name, $selected, + echo array_selector($name, $selected, array( 'Return' => _("Items Returned to Inventory Location"), 'WriteOff' => _("Items Written Off")), array( 'select_submit'=> $submit_on_change ) ); echo "\n"; - return $str; } function credit_type_list_row($label, $name, $selected=null, $submit_on_change=false) { - echo "\n"; - $str = credit_type_list_cells($label, $name, $selected, $submit_on_change); + echo "$label"; + credit_type_list_cells(null, $name, $selected, $submit_on_change); echo "\n"; - return $str; } function number_list($name, $selected, $from, $to, $no_option=false) @@ -1943,7 +2034,7 @@ function number_list($name, $selected, $from, $to, $no_option=false) return array_selector($name, $selected, $items, array( 'spec_option' => $no_option, - 'spec_id' => reserved_words::get_all_numeric()) ); + 'spec_id' => ALL_NUMERIC) ); } function number_list_cells($label, $name, $selected, $from, $to, $no_option=false) @@ -1951,14 +2042,14 @@ function number_list_cells($label, $name, $selected, $from, $to, $no_option=fals if ($label != null) label_cell($label); echo "\n"; - number_list($name, $selected, $from, $to, $no_option); + echo number_list($name, $selected, $from, $to, $no_option); echo "\n"; } function number_list_row($label, $name, $selected, $from, $to, $no_option=false) { - echo "\n"; - number_list_cells($label, $name, $selected, $from, $to, $no_option); + echo "$label"; + echo number_list_cells(null, $name, $selected, $from, $to, $no_option); echo "\n"; } @@ -1975,10 +2066,10 @@ function print_profiles_list_row($label, $name, $selected_id=null, $spec_opt=fal echo ""; if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; - array_selector($name, $selected_id, $profiles, + echo array_selector($name, $selected_id, $profiles, array( 'select_submit'=> $submit_on_change, 'spec_option'=>$spec_opt, 'spec_id' => '' @@ -1999,7 +2090,7 @@ function printers_list($name, $selected_id=null, $spec_opt=false, $submit_on_cha $printers[$myrow['id']] = $myrow['name'].' - '.$myrow['description']; } } - array_selector($name, $selected_id, $printers, + return array_selector($name, $selected_id, $printers, array( 'select_submit'=> $submit_on_change, 'spec_option'=>$spec_opt, 'spec_id' => '' @@ -2015,7 +2106,7 @@ function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_cha if ($type != null) $sql .= " WHERE type=$type"; - combo_input($name, $selected_id, $sql, 'id', 'description', + return combo_input($name, $selected_id, $sql, 'id', 'description', array( 'spec_id' => '', 'order' => 'description', @@ -2027,15 +2118,17 @@ function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_cha function quick_entries_list_cells($label, $name, $selected_id=null, $type, $submit_on_change=false) { - echo "$label\n"; - quick_entries_list($name, $selected_id, $type, $submit_on_change); + if ($label != null) + echo "$label\n"; + echo ""; + echo quick_entries_list($name, $selected_id, $type, $submit_on_change); echo ""; } function quick_entries_list_row($label, $name, $selected_id=null, $type, $submit_on_change=false) { - echo "\n"; - quick_entries_list_cells($label, $name, $selected_id, $type, $submit_on_change); + echo "$label"; + quick_entries_list_cells(null, $name, $selected_id, $type, $submit_on_change); echo "\n"; } @@ -2044,8 +2137,8 @@ function quick_actions_list_row($label, $name, $selected_id=null, $submit_on_cha { global $quick_actions; - echo "$label"; - array_selector($name, $selected_id, $quick_actions, + echo "$label"; + echo array_selector($name, $selected_id, $quick_actions, array( 'select_submit'=> $submit_on_change ) ); @@ -2056,13 +2149,230 @@ function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on { global $quick_entry_types; - echo "$label"; - array_selector($name, $selected_id, $quick_entry_types, + echo "$label"; + echo array_selector($name, $selected_id, $quick_entry_types, array( 'select_submit'=> $submit_on_change ) ); echo "\n"; } +function record_status_list_row($label, $name) { + return yesno_list_row($label, $name, null, _('Inactive'), _('Active')); +} + +function class_types_list_row($label, $name, $selected_id=null, $submit_on_change=false) +{ + global $class_types; + + echo "$label"; + echo array_selector($name, $selected_id, $class_types, + array( + 'select_submit'=> $submit_on_change + ) ); + echo "\n"; +} + +//------------------------------------------------------------------------------------------------ + +function security_roles_list($name, $selected_id=null, $new_item=false, $submit_on_change=false, + $show_inactive = false) +{ + global $all_items; + + $sql = "SELECT id, role, inactive FROM ".TB_PREF."security_roles"; + +return combo_input($name, $selected_id, $sql, 'id', 'description', + array( + 'spec_option'=>$new_item ? _("New role") : false, + 'spec_id' => '', + 'select_submit'=> $submit_on_change, + 'show_inactive' => $show_inactive + ) ); +} + +function security_roles_list_cells($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false, + $show_inactive = false) +{ + if ($label != null) + echo "$label\n"; + echo ""; + echo security_roles_list($name, $selected_id, $new_item, $submit_on_change, $show_inactive); + echo "\n"; +} + +function security_roles_list_row($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false, + $show_inactive = false) +{ + echo "$label"; + security_roles_list_cells(null, $name, $selected_id, $new_item, $submit_on_change, $show_inactive); + echo "\n"; +} + +function tab_list_row($label, $name, $selected_id=null) +{ + global $installed_extensions; + + $tabs = array(); + foreach ($_SESSION['App']->applications as $app) { + $tabs[$app->id] = access_string($app->name, true); + } + echo "\n"; + echo "$label\n"; + echo array_selector($name, $selected_id, $tabs); + echo "\n"; +} + +//----------------------------------------------------------------------------------------------- + +function tag_list($name, $height, $type, $multi=false, $all=false, $spec_opt = false) +{ + // Get tags + global $path_to_root; + include_once($path_to_root . "/admin/db/tags_db.inc"); + $results = get_tags($type, $all); + + while ($tag = db_fetch($results)) + $tags[$tag['id']] = $tag['name']; + + if (!isset($tags)) { + $tags[''] = $all ? _("No tags defined.") : _("No active tags defined."); + $spec_opt = false; + } + return array_selector($name, null, $tags, + array( + 'multi' => $multi, + 'height' => $height, + 'spec_option'=> $spec_opt, + 'spec_id' => -1, + ) ); +} + +function tag_list_cells($label, $name, $height, $type, $mult=false, $all=false, $spec_opt = false) +{ + if ($label != null) + echo "$label\n"; + echo "\n"; + echo tag_list($name, $height, $type, $mult, $all, $spec_opt); + echo "\n"; + +} + +function tag_list_row($label, $name, $height, $type, $mult=false, $all=false, $spec_opt = false) +{ + echo "$label"; + tag_list_cells(null, $name, $height, $type, $mult, $all, $spec_opt); + echo "\n"; +} + +//--------------------------------------------------------------------------------------------- +// List of sets of active extensions +// +function extset_list($name, $value=null, $submit_on_change=false) +{ + global $db_connections; + + $items = array(); + foreach ($db_connections as $comp) + $items[] = sprintf(_("Activated for '%s'"), $comp['name']); + return array_selector( $name, $value, $items, + array( + 'spec_option'=> _("Available and/or installed"), + 'spec_id' => -1, + 'select_submit'=> $submit_on_change, + 'async' => true + )); +} + +function crm_category_types_list($name, $selected_id=null, $filter=array(), $submit_on_change=true) +{ + + $sql = "SELECT id, name, type, inactive FROM ".TB_PREF."crm_categories"; + + $multi = false; + $groups = false; + $where = array(); + if (@$filter['class']) { + $where[] = 'type='.db_escape($filter['class']); + } else + $groups = 'type'; + if (@$filter['subclass']) $where[] = 'action='.db_escape($filter['subclass']); + if (@$filter['entity']) $where[] = 'entity_id='.db_escape($filter['entity']); + if (@$filter['multi']) { // contact category selector for person + $multi = true; + } + + return combo_input($name, $selected_id, $sql, 'id', 'name', + array( + 'multi' => $multi, + 'height' => $multi ? 5:1, + 'category' => $groups, + 'select_submit'=> $submit_on_change, + 'async' => true, + 'where' => $where + )); +} + +function crm_category_types_list_row($label, $name, $selected_id=null, $filter=array(), $submit_on_change=true) +{ + echo "$label"; + echo crm_category_types_list($name, $selected_id, $filter, $submit_on_change); + echo "\n"; +} + +function payment_type_list_row($label, $name, $selected_id=null, $submit_on_change=false) +{ + global $pterm_types; + + echo "$label"; + echo array_selector($name, $selected_id, $pterm_types, + array( + 'select_submit'=> $submit_on_change + ) ); + echo "\n"; +} + +function coa_list_row($label, $name, $value=null) +{ + global $path_to_root, $installed_extensions; + + $path = $path_to_root.'/sql/'; + $coas = array(); + $sqldir = opendir($path); + while (false !== ($fname = readdir($sqldir))) + { + if (is_file($path.$fname) && substr($fname,-4)=='.sql' && @($fname[2] == '_')) + { + $ext = array_search_value($fname, $installed_extensions, 'sql'); + if ($ext!=null) { + $descr = $ext['name']; + } elseif ($fname == 'en_US-new.sql') { // two standard COAs + $descr = _("Standard new company American COA (4 digit)"); + } elseif ($fname == 'en_US-demo.sql') { + $descr = _("Standard American COA (4 digit) with demo data"); + } else + $descr = $fname; + + $coas[$fname] = $descr; + } + } + ksort($coas); + + echo "$label\n"; + echo array_selector( $name, $value, $coas ); + echo "\n"; +} + +function payment_services($name) +{ + global $payment_services; + + $services = (object)array_combine(array_keys($payment_services), array_keys($payment_services)); + + return array_selector($name, null, $services, array( + 'spec_option'=> _("No payment Link"), + 'spec_id' => '', + )); +} -?> \ No newline at end of file +?>