X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=62a34df9b9c5612c2e4e62bbc5b3088b8defa243;hb=40a9d669c6b862a3656ddce95bbb04ee75978b13;hp=52475c4eb5d4b0b952059f3f425a6fd51851b0ea;hpb=402235dd9bb7b00d0a560e70fd9ea96efdce8575;p=fa-stable.git diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index 52475c4e..62a34df9 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -1,7 +1,15 @@ . +***********************************************************************/ 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"); @@ -11,7 +19,7 @@ $_search_button = " "; -$all_items = reserved_words::get_all(); +$all_items = ALL_TEXT; //---------------------------------------------------------------------------- // Universal sql combo generator @@ -32,7 +40,6 @@ $opts = array( // default options // submit on select parameters 'default' => '', // default value when $_POST is not set '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, @@ -50,7 +57,8 @@ $opts = array( // default options '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. ); // ------ merge options with defaults ---------- if($options != null) @@ -59,7 +67,7 @@ $opts = array( // default options $search_box = $opts['search_box']===true ? '_'.$name.'_edit' : $opts['search_box']; $search_submit = $opts['search_submit']===true ? '_'.$name.'_button' : $opts['search_submit']; - $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']; $by_id = ($opts['type'] == 0); @@ -85,7 +93,7 @@ $opts = array( // default options $rel = ''; $limit = ''; - if (isset($_POST[$select_submit])) { + if (isset($_POST['_'.$name.'_update'])) { if ($by_id) $txt = $_POST[$name]; if (!$opts['async']) @@ -158,6 +166,12 @@ $opts = array( // default options $sel = 'selected'; $found = $value; } + // 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; @@ -167,7 +181,7 @@ $opts = array( // default options $selector .= "\n"; $lastcat = $cat; } - $selector .= "\n"; + $selector .= "\n"; } db_free_result($result); } @@ -176,8 +190,11 @@ $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; } @@ -190,9 +207,8 @@ $opts = array( // default options $txt = $found; $Ajax->addUpdate($name, $search_box, $txt ? $txt : ''); } - $aspect = $opts['edit_submit'] ? " aspect='editable'" : ''; $selector = "\n"; + . $opts['sel_hint']."' $rel>".$selector."\n"; $Ajax->addUpdate($name, "_{$name}_sel", $selector); @@ -205,7 +221,7 @@ $opts = array( // default options // 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 ---------- @@ -224,7 +240,7 @@ $opts = array( // default options $search_submit)."\n"; } } - default_focus($name); + default_focus(($search_box && $by_id) ? $search_box : $name); $str = $selector; if ($search_box && $opts['cells']) echo ($edit_entry!='' ? "$edit_entry" : '')."$selector"; @@ -255,7 +271,6 @@ $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 // search box parameters @@ -265,7 +280,7 @@ $opts = array( // default options // ------ 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" : ''; @@ -274,7 +289,7 @@ $opts = array( // default options $selected_id = get_post($name, $opts['default']); } - if (isset($_POST[$select_submit])) { + if (isset($_POST[ '_'.$name.'_update'])) { if (!$opts['async']) $Ajax->activate('_page_body'); else @@ -288,7 +303,7 @@ $opts = array( // default options //if($name=='SelectStockFromList') display_error($sql); foreach($items as $value=>$descr) { $sel = ''; - if ($selected_id == $value) { + if ((string)$selected_id === (string)$value) { $sel = 'selected'; $found = $value; } @@ -309,12 +324,12 @@ $opts = array( // default options } if ($found === false) { - $_POST[$name] = $first_id; + $selected_id = $first_id; } + $_POST[$name] = $selected_id; - $aspect = $opts['edit_submit'] ? " aspect='editable'" : ''; $selector = "\n"; + . $opts['sel_hint']."'>".$selector."\n"; $Ajax->addUpdate($name, "_{$name}_sel", $selector); @@ -324,7 +339,7 @@ $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; @@ -345,85 +360,103 @@ function _format_add_curr($row) '' : (" - " . $row[2])); } -function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false) +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'); + if ($editkey) + set_editor('supplier', $name, $editkey); + return 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, '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 )); } -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); + $str = 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 ); + $str = supplier_list($name, $selected_id, $all_option, $submit_on_change, + $all, $editkey); echo "\n"; return $str; } //---------------------------------------------------------------------------------------------- -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'); + if ($editkey) + set_editor('customer', $name, $editkey); + return combo_input($name, $selected_id, $sql, 'debtor_no', 'name', array( 'format' => '_format_add_curr', + 'order' => array('debtor_ref'), 'search_box' => $mode!=0, 'type' => 1, 'size' => 20, '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 ) ); } -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); + $str = 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); + $str = customer_list($name, $selected_id, $all_option, $submit_on_change, + $show_inactive, $editkey); echo "\n\n"; return $str; } @@ -431,17 +464,21 @@ function customer_list_row($label, $name, $selected_id=null, $all_option = false //------------------------------------------------------------------------------------------------ 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 + $sql = "SELECT branch_code, branch_ref FROM ".TB_PREF."cust_branch WHERE debtor_no='" . $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', 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, @@ -450,20 +487,24 @@ return combo_input($name, $selected_id, $sql, 'branch_code', 'br_name', } //------------------------------------------------------------------------------------------------ -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); + $ret = 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); + $ret = customer_branches_list_cells($label, $customer_id, $name, $selected_id, + $all_option, $enabled, $submit_on_change, $editkey); echo ""; return $ret; } @@ -474,7 +515,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( @@ -506,7 +547,7 @@ function locations_list_row($label, $name, $selected_id=null, $all_option=false, 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 @@ -593,7 +634,7 @@ $options = array( 'async' => false, ); - if ($showclosed) + if (!$showclosed) $options['where'][] = "closed=0"; if($showtype) $options['where'][] = "type_=$showtype"; @@ -624,13 +665,17 @@ function dimensions_list_row($label, $name, $selected_id=null, $no_option=false, //--------------------------------------------------------------------------------------------------- -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 FROM ".TB_PREF."stock_master s,".TB_PREF."stock_category c WHERE s.category_id=c.category_id"; + if ($editkey) + set_editor('item', $name, $editkey); + return combo_input($name, $selected_id, $sql, 'stock_id', 's.description', array_merge( array( @@ -652,12 +697,13 @@ 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)); + array('cells'=>true, 'show_inactive'=>$all), $editkey); return $str; } /* @@ -678,19 +724,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 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', @@ -700,7 +750,7 @@ 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", "i.description"), 'search_submit' => get_company_pref('no_item_list')!=0, 'size'=>15, 'select_submit'=> $submit_on_change, @@ -738,58 +788,12 @@ function sales_local_items_list_row($label, $name, $selected_id=null, $all_optio } //------------------------------------------------------------------------------------ -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); + $str = stock_items_list($name, $selected_id, $all_option, $submit_on_change, + array('where'=>array("mb_flag= 'M'"))); + return $str; } function stock_manufactured_items_list_cells($label, $name, $selected_id=null, @@ -798,8 +802,7 @@ 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); + $str = stock_manufactured_items_list($name, $selected_id, $all_option, $submit_on_change); echo "\n"; return $str; } @@ -808,28 +811,28 @@ 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); + $str = stock_manufactured_items_list_cells($label, $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'"))); + array('where'=>array("stock_id != '$parent_stock_id'")), $editkey); return $str; } 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)); + array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true), + $editkey); return $str; } //------------------------------------------------------------------------------------ @@ -854,32 +857,31 @@ function stock_costable_items_list_cells($label, $name, $selected_id=null, //------------------------------------------------------------------------------------ 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, array('where'=>array("mb_flag!= 'M'"), - 'edit_submit' => true)); + 'show_inactive'=>$all), $editkey); return $str; } 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, array('where'=>array("mb_flag!= 'M'"), - 'edit_submit' => true, - 'cells'=>true)); + 'cells'=>true), $editkey); return $str; } 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); + $all_option, $submit_on_change, $editkey); echo "\n"; return $ret; } @@ -888,18 +890,14 @@ function stock_purchasable_items_list_row($label, $name, $selected_id=null, 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 ""; - array_selector($name, $selected_id, $types, + array_selector($name, $selected_id, $stock_types, array( 'select_submit'=> true, 'disabled' => !$enabled) ); @@ -917,10 +915,7 @@ function stock_units_list_row($label, $name, $value=null, $enabled=true) while($unit = db_fetch($result)) $units[$unit['abbr']] = $unit['name']; - array_selector($name, $value, $units, - array( - 'select_submit'=> true, - 'disabled' => !$enabled) ); + array_selector($name, $value, $units, array( 'disabled' => !$enabled) ); echo "\n"; } @@ -934,7 +929,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, ) ); @@ -971,7 +966,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, ) ); @@ -1023,8 +1018,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"; + combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', + array('order'=>array('shipper_name'))); } function shippers_list_cells($label, $name, $selected_id=null) @@ -1047,8 +1043,9 @@ function shippers_list_row($label, $name, $selected_id=null) function sales_persons_list($name, $selected_id=null) { - $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"; + combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', + array('order'=>array('salesman_name'))); } function sales_persons_list_cells($label, $name, $selected_id=null) @@ -1071,7 +1068,7 @@ 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"; + $sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas"; combo_input($name, $selected_id, $sql, 'area_code', 'description', array()); } @@ -1095,7 +1092,7 @@ 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"; + $sql = "SELECT id, description, inactive FROM ".TB_PREF."groups"; combo_input($name, $selected_id, $sql, 'id', 'description', array( 'spec_option' => $special_option===true ? ' ' : $special_option, 'order' => 'description', 'spec_id' => 0, @@ -1181,7 +1178,7 @@ 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"; + $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms"; combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array()); } @@ -1205,7 +1202,7 @@ 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"; + $sql ="SELECT id, reason_description, inactive FROM ".TB_PREF."credit_status"; combo_input($name, $selected_id, $sql, 'id', 'reason_description', array()); } @@ -1229,7 +1226,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( @@ -1324,7 +1321,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( @@ -1354,7 +1351,7 @@ function workcenter_list_row($label, $name, $selected_id=null, $all_option=false function bank_accounts_list($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"; // , ".TB_PREF."chart_master // WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code"; @@ -1388,7 +1385,7 @@ function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha 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"; @@ -1408,7 +1405,7 @@ function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha 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 ''; @@ -1422,6 +1419,7 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub 'async' => true, 'spec_option' =>$spec_option, 'spec_id' => -1, + 'order'=> array('pos_name') ) ); echo "\n"; @@ -1472,26 +1470,29 @@ function class_list_row($label, $name, $selected_id=null, $submit_on_change=fals //----------------------------------------------------------------------------------------------- -function stock_categories_list($name, $selected_id=null) +function stock_categories_list($name, $selected_id=null, $submit_on_change=false) { - $sql = "SELECT category_id, description FROM ".TB_PREF."stock_category"; + $sql = "SELECT category_id, description, inactive FROM ".TB_PREF."stock_category"; combo_input($name, $selected_id, $sql, 'category_id', 'description', - array('order'=>'category_id')); + array('order'=>'category_id', + '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, $submit_on_change=false) { if ($label != null) echo "$label\n"; echo ""; - stock_categories_list($name, $selected_id); + stock_categories_list($name, $selected_id, $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, $submit_on_change=false) { echo "\n"; - stock_categories_list_cells($label, $name, $selected_id); + stock_categories_list_cells($label, $name, $selected_id, $submit_on_change); echo "\n"; } @@ -1532,17 +1533,17 @@ function gl_account_types_list_row($label, $name, $selected_id=null, $all_option //----------------------------------------------------------------------------------------------- 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"; @@ -1551,7 +1552,7 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals 'format' => '_format_account', 'spec_option' => $all_option===true ? _("Use Item Sales Accounts") : $all_option, 'spec_id' => '', - 'order' => array('name','account_code'), + 'order' => array('type.id','account_code'), 'search_box' => $cells, 'search_submit' => false, 'size' => 12, @@ -1559,7 +1560,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 ) ); } @@ -1570,13 +1572,14 @@ 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); + $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all); echo "\n"; } @@ -1592,8 +1595,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( @@ -1652,15 +1655,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) @@ -1682,17 +1679,14 @@ function bank_account_types_list_row($label, $name, $selected_id=null) //------------------------------------------------------------------------------------------------ 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 ) ); } @@ -1715,60 +1709,13 @@ function payment_person_types_list_row($label, $name, $selected_id=null, $relate return $str; } -//------------------------------------------------------------------------------------------------ - -function quick_entries_list($name, $selected_id=null, $expense=-1, $bank_only=-1, $submit_on_change=false) -{ - $where = false; - $sql = "SELECT id, description FROM ".TB_PREF."quick_entries"; - if ($expense != -1) - { - $sql .= " WHERE deposit=$expense"; - $where = true; - } - if ($bank_only != -1) - { - if ($where) - $sql .= " AND bank_only=$bank_only"; - else - $sql .= " WHERE bank_only=$bank_only"; - } - combo_input($name, $selected_id, $sql, 'id', 'description', - array( - 'spec_id' => '', - 'order' => 'description', - 'select_submit'=> $submit_on_change, - 'async' => false - ) ); - -} - -function quick_entries_list_cells($label, $name, $selected_id=null, $expense=-1, $bank_only=-1, $submit_on_change=false) -{ - echo "$label\n"; - quick_entries_list($name, $selected_id, $expense, $bank_only, $submit_on_change); - echo ""; -} - -function quick_entries_list_row($label, $name, $selected_id=null, $expense=-1, $bank_only=-1, $submit_on_change=false) -{ - echo "\n"; - quick_entries_list_cells($label, $name, $selected_id, $expense, $bank_only, $submit_on_change); - echo "\n"; -} - - //------------------------------------------------------------------------------------------------ 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 ) ); } @@ -1852,16 +1799,25 @@ function pagesizes_list_row($label, $name, $value=null) echo "\n"; } -function security_headings_list_row($label, $name, $value=null) +function systypes_list_cells($label, $name, $value=null, $submit_on_change=false) { - global $security_headings; + global $systypes_array; - echo "$label\n"; - array_selector( $name, $value, $security_headings ); - echo "\n"; + if ($label != null) + echo "$label\n"; + echo ""; + + $str = array_selector($name, $value, $systypes_array, + array( + 'select_submit'=> $submit_on_change, + 'async' => false + ) + ); + echo "\n"; + return $str; } -function systypes_list_cells($label, $name, $value=null, $submit_on_change=false) +function journal_types_list_cells($label, $name, $value=null, $submit_on_change=false) { global $systypes_array; @@ -1869,12 +1825,17 @@ 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_WORKORDER, ST_SALESORDER, ST_DIMENSION, + ST_SALESQUOTE) as $excl) + unset($items[$excl]); $str = array_selector($name, $value, $items, array( + 'spec_option'=> _("All"), + 'spec_id' => -1, 'select_submit'=> $submit_on_change, 'async' => false ) @@ -1977,7 +1938,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) @@ -2040,5 +2001,148 @@ function printers_list($name, $selected_id=null, $spec_opt=false, $submit_on_cha )); } +//------------------------------------------------------------------------------------------------ + +function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_change=false) +{ + $where = false; + $sql = "SELECT id, description FROM ".TB_PREF."quick_entries"; + if ($type != null) + $sql .= " WHERE type=$type"; + + combo_input($name, $selected_id, $sql, 'id', 'description', + array( + 'spec_id' => '', + 'order' => 'description', + 'select_submit'=> $submit_on_change, + 'async' => false + ) ); + +} + +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); + 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 "\n"; +} + + +function quick_actions_list_row($label, $name, $selected_id=null, $submit_on_change=false) +{ + global $quick_actions; + + echo "$label"; + array_selector($name, $selected_id, $quick_actions, + array( + 'select_submit'=> $submit_on_change + ) ); + echo "\n"; +} + +function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on_change=false) +{ + global $quick_entry_types; + + echo "$label"; + 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"; + 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 ""; + $str = security_roles_list($name, $selected_id, $new_item, $submit_on_change, $show_inactive); + echo "\n"; + return $str; +} + +function security_roles_list_row($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false, + $show_inactive = false) +{ + echo ""; + $str = security_roles_list_cells($label, $name, $selected_id, $new_item, $submit_on_change, $show_inactive); + echo "\n"; + return $str; +} + +function tab_list_row($label, $name, $selected_id=null) +{ + global $tabs; + echo "\n"; + echo "$label\n"; + + $items = array(); + + array_selector($name, $selected_id, $tabs); + + 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']); + array_selector( $name, $value, $items, + array( + 'spec_option'=> _("Installed on system"), + 'spec_id' => -1, + 'select_submit'=> $submit_on_change, + 'async' => true + )); +} ?> \ No newline at end of file