X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=b2332aeab064e42ad5981ff045a663fde8260c03;hb=cf7be1f00c6abe59755286e0c3108d9d3c0356da;hp=0d38d72203d202131b40c275f4f6afffaa4d0b8d;hpb=45e45a854c40a7a2f9cc8f11e07a259c6923babd;p=fa-stable.git diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index 0d38d722..b2332aea 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -1,5 +1,14 @@ . +***********************************************************************/ include_once($path_to_root . "/includes/banking.inc"); include_once($path_to_root . "/includes/reserved.inc"); include_once($path_to_root . "/includes/types.inc"); @@ -32,7 +41,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, @@ -49,7 +57,9 @@ $opts = array( // default options '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 + 'box_hint' => null, // box/selectors hints; null = std see below + 'category' => false, // category column name or false + 'show_inactive' => false // show inactive records. ); // ------ merge options with defaults ---------- if($options != null) @@ -58,7 +68,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); @@ -84,7 +94,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']) @@ -121,11 +131,20 @@ $opts = array( // default options } // sql completion if (count($opts['where'])) { - $sql .= strpos($sql, 'WHERE')==false ? ' WHERE ':' AND '; - $sql .= '('. implode($opts['where'], ' AND ') . ')'; + $where = strpos($sql, 'WHERE')==false ? ' WHERE ':' AND '; + $where .= '('. implode($opts['where'], ' AND ') . ')'; + $group_pos = strpos($sql, 'GROUP BY'); + if ($group_pos) { + $group = substr($sql, $group_pos); + $sql = substr($sql, 0, $group_pos) . $where.' '.$group; + } else { + $sql .= $where; + } } if ($opts['order'] != false) { - $sql .= ' ORDER BY '.$opts['order']; + if (!is_array($opts['order'])) + $opts['order'] = array($opts['order']); + $sql .= ' ORDER BY '.implode(',',$opts['order']); } $sql .= $limit; @@ -133,7 +152,8 @@ $opts = array( // default options $selector = $first_opt = ''; $first_id = false; $found = false; -//if($name=='contact_sel') display_error($sql); + $lastcat = null; +//if($name=='stock_id') display_error($sql); if($result = db_query($sql)) { while ($contact_row = db_fetch($result)) { $value = $contact_row[0]; @@ -147,11 +167,22 @@ $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; } - $selector .= "\n"; + $cat = $contact_row[$opts['category']]; + if ($opts['category'] !== false && $cat != $lastcat){ + $selector .= "\n"; + $lastcat = $cat; + } + $selector .= "\n"; } db_free_result($result); } @@ -160,8 +191,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; } @@ -174,9 +208,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); @@ -189,7 +222,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 ---------- @@ -208,7 +241,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"; @@ -239,7 +272,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 @@ -249,7 +281,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" : ''; @@ -258,7 +290,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 @@ -272,7 +304,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; } @@ -293,12 +325,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); @@ -308,7 +340,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; @@ -329,55 +361,67 @@ 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_name, 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', '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, name, 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', @@ -387,27 +431,31 @@ return combo_input($name, $selected_id, $sql, 'debtor_no', 'name', '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; } @@ -415,13 +463,16 @@ 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 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( @@ -434,20 +485,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; } @@ -458,7 +513,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( @@ -490,7 +545,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 @@ -577,7 +632,7 @@ $options = array( 'async' => false, ); - if ($showclosed) + if (!$showclosed) $options['where'][] = "closed=0"; if($showtype) $options['where'][] = "type_=$showtype"; @@ -586,35 +641,39 @@ $options = array( } function dimensions_list_cells($label, $name, $selected_id=null, $no_option=false, $showname=null, - $showclosed=false, $showtype=0) + $showclosed=false, $showtype=0, $submit_on_change=false) { if ($label != null) echo "$label\n"; echo ""; - $str = dimensions_list($name, $selected_id, $no_option, $showname, false, $showclosed, $showtype); + $str = 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) + $showclosed=false, $showtype=0, $submit_on_change=false) { echo "\n"; $str = dimensions_list_cells($label, $name, $selected_id, $no_option, $showname, - $showclosed, $showtype); + $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 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( @@ -625,22 +684,24 @@ function stock_items_list($name, $selected_id=null, $all_option=false, $submit_o 'search' => array("stock_id", "c.description","s.description"), 'search_submit' => get_company_pref('no_item_list')!=0, 'size'=>10, - 'select_submit'=> $submit_on_change + 'select_submit'=> $submit_on_change, + 'category' => 2, + 'order' => array('c.description','stock_id') ), $opts) ); } function _format_stock_items($row) { - return (user_show_codes() ? ($row[0] . " - ") : "") - . $row[2] . " - " . $row[1]; + 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; } /* @@ -652,60 +713,85 @@ function stock_items_list_row($label, $name, $selected_id=null, $all_option=fals return $str; } */ -//------------------------------------------------------------------------------------ - -function base_stock_items_list($where, $name, $selected_id=null, - $all_option=false, $submit_on_change=false) +//--------------------------------------------------------------------------------------------------- +// +// Select item via foreign code. +// +function sales_items_list($name, $selected_id=null, $all_option=false, + $submit_on_change=false, $type='', $opts=array()) { global $all_items; + // all sales codes + $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 + WHERE i.stock_id=s.stock_id"; - $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"; + + if ($type == 'local') { // exclude foreign codes + $sql .= " AND !i.is_foreign"; + } elseif ($type == 'kits') { // sales kits + $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, 'stock_id', 's.description', - array( + return combo_input($name, $selected_id, $sql, 'i.item_code', 'c.description', + array_merge( + array( 'format' => '_format_stock_items', - 'spec_option' => $all_option==true ? _("All Items") : $all_option, + 'spec_option' => $all_option===true ? _("All Items") : $all_option, 'spec_id' => $all_items, + 'search_box' => true, + 'search' => array("i.item_code", "i.description"), + 'search_submit' => get_company_pref('no_item_list')!=0, + 'size'=>15, 'select_submit'=> $submit_on_change, - 'where' => $where - ) ); + 'category' => 2, + 'order' => array('c.description','i.item_code') + ), $opts) ); } -//------------------------------------------------------------------------------------ -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) +function sales_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"; + $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change, + '', array('cells'=>true)); return $str; } -function stock_bom_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) +function sales_kits_list($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"; + $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change, + 'kits', array('cells'=>false)); + return $str; +} + +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 ""; + $str = sales_items_list($name, $selected_id, $all_option, $submit_on_change, + 'local', array('cells'=>false)); + echo ""; 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, @@ -714,8 +800,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; } @@ -724,28 +809,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; } //------------------------------------------------------------------------------------ @@ -770,32 +855,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; } @@ -804,18 +888,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) ); @@ -833,10 +913,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"; } @@ -939,7 +1016,7 @@ 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"; + $sql = "SELECT shipper_id, shipper_name, inactive FROM ".TB_PREF."shippers"; combo_input($name, $selected_id, $sql, 'shipper_id', 'shipper_name', array()); } @@ -963,7 +1040,7 @@ 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"; + $sql = "SELECT salesman_code, salesman_name, inactive FROM ".TB_PREF."salesman"; combo_input($name, $selected_id, $sql, 'salesman_code', 'salesman_name', array()); } @@ -987,7 +1064,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()); } @@ -1009,6 +1086,68 @@ 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, 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, + )); +} + +function sales_groups_list_cells($label, $name, $selected_id=null, $special_option=false) +{ + if ($label != null) + echo "$label\n"; + 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 "\n"; +} + +//------------------------------------------------------------------------------------ + +function _format_template_items($row) +{ + return ($row[0] . " -  " . _("Amount") . " ".$row[1]); +} + +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( + 'format' => '_format_template_items', + 'spec_option' => $special_option===true ? ' ' : $special_option, + 'order' => 'order_no', 'spec_id' => 0, + )); +} + +function templates_list_cells($label, $name, $selected_id=null, $special_option=false) +{ + if ($label != null) + echo "$label\n"; + 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 "\n"; +} + +//------------------------------------------------------------------------------------ + function workorders_list($name, $selected_id=null) { $sql = "SELECT id, wo_ref FROM ".TB_PREF."workorders WHERE closed=0"; @@ -1035,7 +1174,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()); } @@ -1059,7 +1198,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()); } @@ -1083,7 +1222,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( @@ -1137,26 +1276,38 @@ function movement_types_list_row($label, $name, $selected_id=null) } //----------------------------------------------------------------------------------------------- -/* -function bank_trans_types_list($name, $selected_id=null) +function _format_date($row) { - $sql = "SELECT id, name FROM ".TB_PREF."bank_trans_types"; - combo_input($name, $selected_id, $sql, 'id', 'name', array()); + return sql2date($row['reconciled']); +} + +function bank_reconciliation_list($account, $name, $selected_id=null, $submit_on_change=false, $special_option=false) +{ + $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', + array( + 'spec_option' => $special_option, + 'format' => '_format_date', + 'spec_id' => '', + 'select_submit'=> $submit_on_change + ) ); } -function bank_trans_types_list_cells($label, $name, $selected_id=null) +function bank_reconciliation_list_cells($label,$account, $name, $selected_id=null, $submit_on_change=false, $special_option=false) { if ($label != null) echo "$label\n"; echo ""; - bank_trans_types_list($name, $selected_id); + bank_reconciliation_list($account, $name, $selected_id, $submit_on_change, $special_option); echo "\n"; } - -function bank_trans_types_list_row($label, $name, $selected_id=null) +/* +function bank_reconciliation_list_row($label, $account, $name, $selected_id=null, $submit_on_change=false, $special_option=false) { echo "\n"; - bank_trans_types_list_cells($label, $name, $selected_id); + bank_reconciliation_list_cells($label, $account, $name, $selected_id, $submit_on_change, $special_option); echo "\n"; } */ @@ -1166,7 +1317,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( @@ -1196,9 +1347,10 @@ 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 - FROM ".TB_PREF."bank_accounts, ".TB_PREF."chart_master - WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_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( @@ -1229,15 +1381,14 @@ 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.account_code, bank_account_name, bank_curr_code - FROM ".TB_PREF."bank_accounts, ".TB_PREF."chart_master - WHERE ".TB_PREF."bank_accounts.account_code=".TB_PREF."chart_master.account_code" - . " AND ".TB_PREF."bank_accounts.account_type=3"; + $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"; if ($label != null) echo "$label\n"; echo ""; - $str = combo_input($name, $selected_id, $sql, 'account_code', 'bank_account_name', + $str = combo_input($name, $selected_id, $sql, 'id', 'bank_account_name', array( 'format' => '_format_add_curr', 'select_submit'=> $submit_on_change, @@ -1250,7 +1401,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 ''; @@ -1314,26 +1465,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"; } @@ -1374,33 +1528,35 @@ 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, - $show_group=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 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 + 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 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', array( - 'format' => '_format_account' . ($show_group ? '2' : ''), + 'format' => '_format_account', 'spec_option' => $all_option===true ? _("Use Item Sales Accounts") : $all_option, 'spec_id' => '', - 'order' => 'account_code', + 'order' => array('name','account_code'), 'search_box' => $cells, 'search_submit' => false, 'size' => 12, 'max' => 10, 'cells' => true, 'select_submit'=> $submit_on_change, - 'async' => false + 'async' => false, + 'category' => 2, + 'show_inactive' => $all ) ); } @@ -1410,35 +1566,32 @@ function _format_account($row) return $row[0] . "    " . $row[1]; } -function _format_account2($row) -{ - return $row[0] . "    " . $row[2] . "      " . $row[1]; -} - -function gl_all_accounts_list_cells($label, $name, $selected_id=null, $skip_bank_accounts=false, - $show_group=false, $cells=false, $all_option=false) +function gl_all_accounts_list_cells($label, $name, $selected_id=null, + $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, $show_group, $cells, $all_option); + 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, - $show_group=false, $cells=false, $all_option=false) +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, $skip_bank_accounts, - $show_group, $cells, $all_option); + gl_all_accounts_list_cells($label, $name, $selected_id, + $skip_bank_accounts, $cells, $all_option); echo "\n"; } 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( @@ -1534,7 +1687,8 @@ function payment_person_types_list($name, $selected_id=null, $submit_on_change=f { if (payment_person_types::has_items($type['id'])) { - $items[$type['id']] = $type['name']; + if ($type['id'] != payment_person_types::WorkOrder()) + $items[$type['id']] = $type['name']; } } @@ -1560,37 +1714,6 @@ function payment_person_types_list_row($label, $name, $selected_id=null, $relate return $str; } -//------------------------------------------------------------------------------------------------ - -function quick_entries_list($name, $selected_id=null, $expense=true, $bank_only=true, $submit_on_change=false) -{ - $sql = "SELECT id, description FROM ".TB_PREF."quick_entries"; - if ($expense) - $sql .= " WHERE deposit=0"; - else - $sql .= " WHERE deposit=1"; - if ($bank_only) - $sql .= " AND bank_only=1"; - else - $sql .= " AND bank_only=0"; - combo_input($name, $selected_id, $sql, 'id', 'description', - array( - 'spec_id' => '', - 'order' => 'description', - 'select_submit'=> $submit_on_change, - 'async' => false - ) ); - -} - -function quick_entries_list_row($label, $name, $selected_id=null, $expense=true, $bank_only=true, $submit_on_change=false) -{ - echo "$label\n"; - quick_entries_list($name, $selected_id, $expense, $bank_only, $submit_on_change); - echo "\n"; -} - - //------------------------------------------------------------------------------------------------ function wo_types_list($name, $selected_id=null) @@ -1716,6 +1839,32 @@ function systypes_list_cells($label, $name, $value=null, $submit_on_change=false return $str; } +function journal_types_list_cells($label, $name, $value=null, $submit_on_change=false) +{ + global $systypes_array; + + if ($label != null) + echo "$label\n"; + echo ""; + + $items = array(); + foreach ($systypes_array as $key=>$type) + // exclude orders and dimensions + if (!in_array($key, array(18,26,30,40))) + $items[$key] = $type['name']; + + $str = 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"; @@ -1873,5 +2022,79 @@ 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"; +} + ?> \ No newline at end of file