X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=4fc34b919a9acbacdef88bcbc72d1479b4608b21;hb=a2ae0e35302270ae811db2e6acb44c16b186a970;hp=e85e38995f574d4fd02638a162020c8f5a9ae41c;hpb=e9782c04faf09dd040dbc0c908cdb6e6d4f0dcfc;p=fa-stable.git diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index e85e3899..4fc34b91 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -13,13 +13,11 @@ include_once($path_to_root . "/includes/banking.inc"); include_once($path_to_root . "/includes/types.inc"); include_once($path_to_root . "/includes/current_user.inc"); -$_search_button = " "; +define('SEARCH_BUTTON', " "); -$_select_button = " "; - -$all_items = ALL_TEXT; +define('SELECT_BUTTON', " "); //---------------------------------------------------------------------------- // Universal sql combo generator @@ -62,7 +60,8 @@ $opts = array( // default options 'box_hint' => null, // box/selectors hints; null = std see below 'category' => false, // category column name or false 'show_inactive' => false, // show inactive records. - 'editable' => false // false, or length of editable entry field + 'editable' => false, // false, or length of editable entry field + 'editlink' => false // link to entity entry/edit page (optional) ); // ------ merge options with defaults ---------- if($options != null) @@ -181,8 +180,6 @@ $opts = array( // default options $found = false; $lastcat = null; $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]; @@ -214,11 +211,15 @@ $opts = array( // default options } $cat = $contact_row[$opts['category']]; if ($opts['category'] !== false && $cat != $lastcat){ + if ($lastcat!==null) + $selector .= ""; $selector .= "\n"; $lastcat = $cat; } $selector .= "\n"; } + if ($lastcat!==null) + $selector .= ""; db_free_result($result); } @@ -226,8 +227,6 @@ $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' : ''; $optclass = @$contact_row['inactive'] ? "class='inactive'" : ''; $selector = "\n" @@ -266,9 +265,8 @@ $opts = array( // default options // 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(), + $selector .= sprintf(SELECT_BUTTON, $disabled, user_theme(), (fallback_mode() ? '' : 'display:none;'), '_'.$name.'_update')."\n"; } @@ -282,14 +280,16 @@ $opts = array( // default options .(!fallback_mode() && !$by_id ? " style=display:none;":'') .">\n"; if ($search_submit != false || $opts['editable']) { - global $_search_button; - $edit_entry .= sprintf($_search_button, $disabled, user_theme(), + $edit_entry .= sprintf(SEARCH_BUTTON, $disabled, user_theme(), (fallback_mode() ? '' : 'display:none;'), $search_submit ? $search_submit : "_{$name}_button")."\n"; } } default_focus(($search_box && $by_id) ? $search_box : $name); + if ($opts['editlink']) + $selector .= ' '.$opts['editlink']; + if ($search_box && $opts['cells']) $str = ($edit_entry!='' ? "$edit_entry" : '')."$selector"; else @@ -352,23 +352,21 @@ $opts = array( // default options $selector = $first_opt = ''; $first_id = false; $found = false; -//if($name=='SelectStockFromList') display_error($sql); - foreach($items as $value=>$descr) { - $sel = ''; - if (in_array((string)$value, $selected_id, true)) { - $sel = 'selected'; - $found = $value; - } - if ($first_id === false) { - $first_id = $value; - $first_opt = $descr; - } - $selector .= "\n"; + foreach($items as $value=>$descr) { + $sel = ''; + if (in_array((string)$value, $selected_id, true)) { + $sel = 'selected'; + $found = $value; + } + if ($first_id === false) { + $first_id = $value; + $first_opt = $descr; } + $selector .= "\n"; + } if ($first_id!==false) { $sel = ($found===$first_id) || ($found===false && ($spec_option===false)) ? "selected='selected'" : ''; - $selector = sprintf($first_opt, $sel).$selector; } // Prepend special option. if ($spec_option !== false) { // if special option used - add it @@ -394,8 +392,7 @@ $opts = array( // default options $selector = "".$selector."\n"; if ($select_submit != false) { // if submit on change is used - add select button - global $_select_button; - $selector .= sprintf($_select_button, $disabled, user_theme(), + $selector .= sprintf(SELECT_BUTTON, $disabled, user_theme(), (fallback_mode() ? '' : 'display:none;'), '_'.$name.'_update')."\n"; } @@ -419,9 +416,9 @@ function _format_add_curr($row) function add_edit_combo($type) { - global $path_to_root, $popup_editors, $use_icon_for_editkey; + global $path_to_root, $popup_editors, $SysPrefs; - if (!isset($use_icon_for_editkey) || $use_icon_for_editkey==0) + if (!isset($SysPrefs->use_icon_for_editkey) || $SysPrefs->use_icon_for_editkey==0) return ""; // Derive theme path $theme_path = $path_to_root . '/themes/' . user_theme(); @@ -435,7 +432,6 @@ function add_edit_combo($type) 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_ref, curr_code, inactive FROM ".TB_PREF."suppliers "; @@ -450,16 +446,16 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_ 'order' => array('supp_ref'), 'search_box' => $mode!=0, 'type' => 1, + 'search' => array("supp_ref","supp_name","gst_no"), 'spec_option' => $spec_option === true ? _("All Suppliers") : $spec_option, - 'spec_id' => $all_items, + 'spec_id' => ALL_TEXT, 'select_submit'=> $submit_on_change, 'async' => false, 'sel_hint' => $mode ? _('Press Space tab to filter by name fragment') : _('Select supplier'), - 'show_inactive'=>$all + 'show_inactive'=>$all, + 'editlink' => $editkey ? add_edit_combo('supplier') : false )); - if ($editkey) - $ret .= add_edit_combo('supplier'); return $ret; } @@ -486,7 +482,6 @@ function supplier_list_row($label, $name, $selected_id=null, $all_option = 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, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master "; @@ -502,16 +497,16 @@ function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_ '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, + 'spec_id' => ALL_TEXT, 'select_submit'=> $submit_on_change, 'async' => false, 'sel_hint' => $mode ? _('Press Space tab to filter by name fragment; F2 - entry new customer') : _('Select customer'), - 'show_inactive' => $show_inactive + 'show_inactive' => $show_inactive, + 'editlink' => $editkey ? add_edit_combo('customer') : false ) ); - if ($editkey) - $ret .= add_edit_combo('customer'); return $ret; } @@ -541,7 +536,6 @@ 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, $editkey = false) { - global $all_items; $sql = "SELECT branch_code, branch_ref FROM ".TB_PREF."cust_branch WHERE debtor_no=" . db_escape($customer_id)." "; @@ -549,20 +543,17 @@ function customer_branches_list($customer_id, $name, $selected_id=null, if ($editkey) set_editor('branch', $name, $editkey); - $where = $enabled ? array("disable_trans = 0") : array(); + $where = $enabled ? array("inactive = 0") : array(); $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, + 'spec_id' => ALL_TEXT, 'select_submit'=> $submit_on_change, - 'sel_hint' => _('Select customer branch') + 'sel_hint' => _('Select customer branch'), + 'editlink' => $editkey ? add_edit_combo('branch') : false ) ); - if ($editkey) - { - $ret .= add_edit_combo('branch'); - } return $ret; } //------------------------------------------------------------------------------------------------ @@ -591,16 +582,15 @@ function customer_branches_list_row($label, $customer_id, $name, $selected_id=nu function locations_list($name, $selected_id=null, $all_option=false, $submit_on_change=false) { - global $all_items; $sql = "SELECT loc_code, location_name, inactive FROM ".TB_PREF."locations"; -return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name', - array( - 'spec_option' => $all_option === true ? _("All Locations") : $all_option, - 'spec_id' => $all_items, - 'select_submit'=> $submit_on_change - ) ); + return combo_input($name, $selected_id, $sql, 'loc_code', 'location_name', + array( + 'spec_option' => $all_option === true ? _("All Locations") : $all_option, + 'spec_id' => ALL_TEXT, + 'select_submit'=> $submit_on_change + ) ); } function locations_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) @@ -625,13 +615,13 @@ function currencies_list($name, $selected_id=null, $submit_on_change=false) { $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, - 'default' => get_company_currency(), - 'async' => false - ) ); + // default to the company currency + return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency', + array( + 'select_submit'=> $submit_on_change, + 'default' => get_company_currency(), + 'async' => false + ) ); } function currencies_list_cells($label, $name, $selected_id=null, $submit_on_change=false) @@ -657,22 +647,22 @@ function fiscalyears_list($name, $selected_id=null, $submit_on_change=false) $sql = "SELECT * FROM ".TB_PREF."fiscal_year"; -// default to the company current fiscal year + // default to the company current fiscal year -return combo_input($name, $selected_id, $sql, 'id', '', - array( - 'order' => 'begin', - 'default' => get_company_pref('f_year'), - 'format' => '_format_fiscalyears', - 'select_submit'=> $submit_on_change, - 'async' => false - ) ); + return combo_input($name, $selected_id, $sql, 'id', '', + array( + 'order' => 'begin', + 'default' => get_company_pref('f_year'), + 'format' => '_format_fiscalyears', + 'select_submit'=> $submit_on_change, + 'async' => false + ) ); } 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) @@ -695,20 +685,20 @@ function fiscalyears_list_row($label, $name, $selected_id=null) function dimensions_list($name, $selected_id=null, $no_option=false, $showname=' ', $submit_on_change=false, $showclosed=false, $showtype=1) { -$sql = "SELECT id, CONCAT(reference,' ',name) as ref FROM ".TB_PREF."dimensions"; + $sql = "SELECT id, CONCAT(reference,' ',name) as ref FROM ".TB_PREF."dimensions"; -$options = array( - 'order' => 'reference', - 'spec_option'=>$no_option ? $showname : false, - 'spec_id' => 0, - 'select_submit'=> $submit_on_change, - 'async' => false, + $options = array( + 'order' => 'reference', + 'spec_option'=>$no_option ? $showname : false, + 'spec_id' => 0, + 'select_submit'=> $submit_on_change, + 'async' => false, ); 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); } @@ -737,7 +727,6 @@ 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(), $editkey = false) { - global $all_items; $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"; @@ -746,21 +735,22 @@ function stock_items_list($name, $selected_id=null, $all_option=false, set_editor('item', $name, $editkey); $ret = combo_input($name, $selected_id, $sql, 'stock_id', 's.description', - array_merge( - array( - 'format' => '_format_stock_items', - 'spec_option' => $all_option===true ? _("All Items") : $all_option, - 'spec_id' => $all_items, - 'search_box' => true, - 'search' => array("stock_id", "c.description","s.description"), - 'search_submit' => get_company_pref('no_item_list')!=0, - 'size'=>10, - 'select_submit'=> $submit_on_change, - 'category' => 2, - 'order' => array('c.description','stock_id') - ), $opts) ); - if ($editkey) - $ret .= add_edit_combo('item'); + array_merge( + array( + 'format' => '_format_stock_items', + 'spec_option' => $all_option===true ? _("All Items") : $all_option, + 'spec_id' => ALL_TEXT, + 'search_box' => true, + 'search' => array("stock_id", "c.description","s.description"), + 'search_submit' => get_company_pref('no_item_list')!=0, + 'size'=>10, + 'select_submit'=> $submit_on_change, + 'category' => 2, + 'order' => array('c.description','stock_id'), + 'editlink' => $editkey ? add_edit_combo('item') : false, + 'editable' => false, + 'max' => 255 + ), $opts) ); return $ret; } @@ -770,12 +760,12 @@ function _format_stock_items($row) } function stock_items_list_cells($label, $name, $selected_id=null, $all_option=false, - $submit_on_change=false, $all=false, $editkey = false) + $submit_on_change=false, $all=false, $editkey = false, $opts= array()) { if ($label != null) echo "$label\n"; echo stock_items_list($name, $selected_id, $all_option, $submit_on_change, - array('cells'=>true, 'show_inactive'=>$all), $editkey); + array_merge(array('cells'=>true, 'show_inactive'=>$all), $opts), $editkey); } /* function stock_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) @@ -792,7 +782,6 @@ function stock_items_list_row($label, $name, $selected_id=null, $all_option=fals 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, if(count(*)>1, '0', s.editable) as editable @@ -814,25 +803,28 @@ function sales_items_list($name, $selected_id=null, $all_option=false, $sql .= " GROUP BY i.item_code"; 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_id' => $all_items, - 'search_box' => true, - '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'), - 'editable' => 30, - 'max' => 255 - ), $opts) ); + array_merge( + array( + 'format' => '_format_stock_items', + 'spec_option' => $all_option===true ? _("All Items") : $all_option, + 'spec_id' => ALL_TEXT, + 'search_box' => true, + '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'), + '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"; echo sales_items_list($name, $selected_id, $all_option, $submit_on_change, @@ -887,7 +879,7 @@ function stock_component_items_list($name, $parent_stock_id, $selected_id=null, $all_option=false, $submit_on_change=false, $editkey = false) { return stock_items_list($name, $selected_id, $all_option, $submit_on_change, - array('where'=>array("stock_id != '$parent_stock_id'")), $editkey); + array('where'=>array("stock_id != ".db_escape($parent_stock_id))), $editkey); } function stock_component_items_list_cells($label, $name, $parent_stock_id, @@ -896,7 +888,7 @@ function stock_component_items_list_cells($label, $name, $parent_stock_id, if ($label != null) echo "$label\n"; echo 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 != ".db_escape($parent_stock_id)), 'cells'=>true), $editkey); } //------------------------------------------------------------------------------------ @@ -922,7 +914,7 @@ function stock_purchasable_items_list($name, $selected_id=null, $all_option=false, $submit_on_change=false, $all=false, $editkey=false) { return stock_items_list($name, $selected_id, $all_option, $submit_on_change, - array('where'=>array("mb_flag!= 'M'"), + array('where'=>array("NOT no_purchase"), 'show_inactive'=>$all), $editkey); } // @@ -934,20 +926,11 @@ function stock_purchasable_items_list_cells($label, $name, $selected_id=null, if ($label != null) echo "$label\n"; echo stock_items_list($name, $selected_id, $all_option, $submit_on_change, - array('where'=>array("mb_flag!= 'M'"), + array('where'=>array("NOT no_purchase"), 'editable' => 30, 'cells'=>true), $editkey); } -/* -function stock_purchasable_items_list_row($label, $name, $selected_id=null, - $all_option=false, $submit_on_change=false, $editkey=false) -{ - echo "$label"; - stock_purchasable_items_list_cells(null, $name, $selected_id=null, - $all_option, $submit_on_change, $editkey); - echo "\n"; -} -*/ + //------------------------------------------------------------------------------------ function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=true) @@ -989,12 +972,12 @@ function tax_types_list($name, $selected_id=null, $none_option=false, $submit_on $sql = "SELECT id, CONCAT(name, ' (',rate,'%)') as name FROM ".TB_PREF."tax_types"; return combo_input($name, $selected_id, $sql, 'id', 'name', - array( - 'spec_option' => $none_option, - 'spec_id' => ALL_NUMERIC, - 'select_submit'=> $submit_on_change, - 'async' => false, - ) ); + array( + 'spec_option' => $none_option, + 'spec_id' => ALL_NUMERIC, + 'select_submit'=> $submit_on_change, + 'async' => false, + ) ); } function tax_types_list_cells($label, $name, $selected_id=null, $none_option=false, @@ -1023,13 +1006,13 @@ function tax_groups_list($name, $selected_id=null, $sql = "SELECT id, name FROM ".TB_PREF."tax_groups"; return combo_input($name, $selected_id, $sql, 'id', 'name', - array( - 'order' => 'id', - 'spec_option' => $none_option, - 'spec_id' => ALL_NUMERIC, - 'select_submit'=> $submit_on_change, - 'async' => false, - ) ); + array( + 'order' => 'id', + 'spec_option' => $none_option, + 'spec_id' => ALL_NUMERIC, + 'select_submit'=> $submit_on_change, + 'async' => false, + ) ); } function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false) @@ -1293,7 +1276,6 @@ function sales_types_list($name, $selected_id=null, $submit_on_change=false, $sp 'spec_option' => $special_option===true ? _("All Sales Types") : $special_option, 'spec_id' => 0, 'select_submit'=> $submit_on_change, - // 'async' => false, ) ); } @@ -1315,29 +1297,6 @@ 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"; - return combo_input($name, $selected_id, $sql, 'id', 'name', array()); -} - -function movement_types_list_cells($label, $name, $selected_id=null) -{ - if ($label != null) - echo "$label\n"; - echo ""; - echo movement_types_list($name, $selected_id); - echo "\n"; -} - -function movement_types_list_row($label, $name, $selected_id=null) -{ - echo "$label"; - movement_types_list_cells(null, $name, $selected_id); - echo "\n"; -} - -//----------------------------------------------------------------------------------------------- function _format_date($row) { return sql2date($row['reconciled']); @@ -1349,12 +1308,12 @@ function bank_reconciliation_list($account, $name, $selected_id=null, $submit_on WHERE bank_act=".db_escape($account)." AND reconciled IS NOT NULL GROUP BY reconciled"; return combo_input($name, $selected_id, $sql, 'id', 'reconciled', - array( - 'spec_option' => $special_option, - 'format' => '_format_date', - 'spec_id' => '', - 'select_submit'=> $submit_on_change - ) ); + array( + 'spec_option' => $special_option, + 'format' => '_format_date', + 'spec_id' => '', + 'select_submit'=> $submit_on_change + ) ); } function bank_reconciliation_list_cells($label,$account, $name, $selected_id=null, $submit_on_change=false, $special_option=false) @@ -1377,15 +1336,14 @@ function bank_reconciliation_list_row($label, $account, $name, $selected_id=null function workcenter_list($name, $selected_id=null, $all_option=false) { - global $all_items; $sql = "SELECT id, name, inactive FROM ".TB_PREF."workcentres"; return combo_input($name, $selected_id, $sql, 'id', 'name', - array( - 'spec_option' =>$all_option===true ? _("All Suppliers") : $all_option, - 'spec_id' => $all_items, - ) ); + array( + 'spec_option' =>$all_option===true ? _("All Suppliers") : $all_option, + 'spec_id' => ALL_TEXT, + ) ); } function workcenter_list_cells($label, $name, $selected_id=null, $all_option=false) @@ -1407,17 +1365,19 @@ function workcenter_list_row($label, $name, $selected_id=null, $all_option=false //----------------------------------------------------------------------------------------------- -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, inactive FROM ".TB_PREF."bank_accounts"; return combo_input($name, $selected_id, $sql, 'id', 'bank_account_name', - array( - 'format' => '_format_add_curr', - 'select_submit'=> $submit_on_change, - 'async' => false - ) ); + array( + 'format' => '_format_add_curr', + 'select_submit'=> $submit_on_change, + 'spec_option' => $spec_option, + 'spec_id' => '', + 'async' => false + ) ); } function bank_accounts_list_cells($label, $name, $selected_id=null, $submit_on_change=false) @@ -1439,7 +1399,6 @@ 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, $all_option=false) { - global $all_items; $sql = "SELECT ".TB_PREF."bank_accounts.id, bank_account_name, bank_curr_code, inactive FROM ".TB_PREF."bank_accounts @@ -1449,13 +1408,13 @@ function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha echo "$label\n"; echo ""; echo combo_input($name, $selected_id, $sql, 'id', 'bank_account_name', - array( - 'spec_option' => $all_option, - 'spec_id' => $all_items, - 'format' => '_format_add_curr', - 'select_submit'=> $submit_on_change, - 'async' => true - ) ); + array( + 'spec_option' => $all_option, + 'spec_id' => ALL_TEXT, + 'format' => '_format_add_curr', + 'select_submit'=> $submit_on_change, + 'async' => true + ) ); echo "\n"; } //----------------------------------------------------------------------------------------------- @@ -1471,43 +1430,45 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub echo ""; 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') - ) ); + array( + 'select_submit'=> $submit_on_change, + 'async' => true, + 'spec_option' =>$spec_option, + 'spec_id' => -1, + 'order'=> array('pos_name') + ) ); echo "\n"; } //----------------------------------------------------------------------------------------------- // Payment type selector for current user. // -function sale_payment_list($name, $category, $selected_id=null, $submit_on_change=true) +function sale_payment_list($name, $category, $selected_id=null, $submit_on_change=true, $prepayments=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"; + elseif ($category == PM_CREDIT) // only delayed payments + $sql .= " WHERE days_before_due".($prepayments ? '!=': '>')."0 OR day_in_following_month!=0"; + elseif (!$prepayments) + $sql .= " WHERE days_before_due>=0"; return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', - array( - 'select_submit'=> $submit_on_change, - 'async' => true - ) ); + array( + 'select_submit'=> $submit_on_change, + 'async' => true + ) ); } -function sale_payment_list_cells($label, $name, $category, $selected_id=null, $submit_on_change=true) +function sale_payment_list_cells($label, $name, $category, $selected_id=null, $submit_on_change=true, $prepayments=true) { if ($label != null) echo "$label\n"; echo ""; - echo sale_payment_list($name, $category, $selected_id, $submit_on_change); + echo sale_payment_list($name, $category, $selected_id, $submit_on_change, $prepayments); echo "\n"; } @@ -1518,10 +1479,10 @@ function class_list($name, $selected_id=null, $submit_on_change=false) $sql = "SELECT cid, class_name FROM ".TB_PREF."chart_class"; return combo_input($name, $selected_id, $sql, 'cid', 'class_name', - array( - 'select_submit'=> $submit_on_change, - 'async' => false - ) ); + array( + 'select_submit'=> $submit_on_change, + 'async' => false + ) ); } @@ -1546,12 +1507,12 @@ function stock_categories_list($name, $selected_id=null, $spec_opt=false, $submi { $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 - )); + 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, $spec_opt=false, $submit_on_change=false) @@ -1574,17 +1535,16 @@ function stock_categories_list_row($label, $name, $selected_id=null, $spec_opt=f 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"; return combo_input($name, $selected_id, $sql, 'id', 'name', - array( - 'format' => '_format_account', - 'order' => array('class_id', 'id', 'parent'), - 'spec_option' =>$all_option, - 'spec_id' => $all_items - ) ); + array( + 'format' => '_format_account', + 'order' => array('class_id', 'id', 'parent'), + 'spec_option' =>$all_option, + 'spec_id' => ALL_TEXT + ) ); } function gl_account_types_list_cells($label, $name, $selected_id=null, $all_option=false, $all=false) @@ -1621,28 +1581,27 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals WHERE chart.account_type=type.id"; 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' => '', - 'type' => 2, - 'order' => array('type.class_id','type.id','account_code'), - 'search_box' => $cells, + array( + 'format' => '_format_account', + 'spec_option' => $all_option===true ? _("Use Item Sales Accounts") : $all_option, + 'spec_id' => '', + 'type' => 2, + 'order' => array('type.class_id','type.id','account_code'), + 'search_box' => $cells, 'search_submit' => false, 'size' => 12, 'max' => 10, 'cells' => true, - 'select_submit'=> $submit_on_change, - 'async' => false, - 'category' => 2, - 'show_inactive' => $all - ) ); - + 'select_submit'=> $submit_on_change, + 'async' => false, + 'category' => 2, + 'show_inactive' => $all + ) ); } function _format_account($row) { - return $row[0] . "    " . $row[1]; + return $row[0] . "    " . $row[1]; } function gl_all_accounts_list_cells($label, $name, $selected_id=null, @@ -1801,37 +1760,37 @@ function wo_types_list_row($label, $name, $selected_id=null) function dateformats_list_row($label, $name, $value=null) { - global $dateformats; + global $SysPrefs; echo "$label\n"; - echo array_selector( $name, $value, $dateformats ); + echo array_selector( $name, $value, $SysPrefs->dateformats ); echo "\n"; } function dateseps_list_row($label, $name, $value=null) { - global $dateseps; + global $SysPrefs; echo "$label\n"; - echo array_selector( $name, $value, $dateseps ); + echo array_selector( $name, $value, $SysPrefs->dateseps ); echo "\n"; } function thoseps_list_row($label, $name, $value=null) { - global $thoseps; + global $SysPrefs; echo "$label\n"; - echo array_selector( $name, $value, $thoseps ); + echo array_selector( $name, $value, $SysPrefs->thoseps ); echo "\n"; } function decseps_list_row($label, $name, $value=null) { - global $decseps; + global $SysPrefs; echo "$label\n"; - echo array_selector( $name, $value, $decseps ); + echo array_selector( $name, $value, $SysPrefs->decseps ); echo "\n"; } @@ -1858,10 +1817,10 @@ function themes_list_row($label, $name, $value=null) function pagesizes_list_row($label, $name, $value=null) { - global $pagesizes; + global $SysPrefs; $items = array(); - foreach ($pagesizes as $pz) + foreach ($SysPrefs->pagesizes as $pz) $items[$pz] = $pz; echo "$label\n"; @@ -1912,8 +1871,7 @@ function journal_types_list_cells($label, $name, $value=null, $submit_on_change= $items = $systypes_array; // exclude quotes, orders and dimensions - foreach (array(ST_PURCHORDER, ST_WORKORDER, ST_SALESORDER, ST_DIMENSION, - ST_SALESQUOTE) as $excl) + foreach (array(ST_PURCHORDER, ST_SALESORDER, ST_DIMENSION, ST_SALESQUOTE, ST_LOCTRANSFER) as $excl) unset($items[$excl]); echo array_selector($name, $value, $items, @@ -1929,13 +1887,12 @@ function journal_types_list_cells($label, $name, $value=null, $submit_on_change= function cust_allocations_list_cells($label, $name, $selected=null) { - global $all_items; if ($label != null) label_cell($label); echo "\n"; $allocs = array( - $all_items=>_("All Types"), + ALL_TEXT=>_("All Types"), '1'=> _("Sales Invoices"), '2'=> _("Overdue Invoices"), '3' => _("Payments"), @@ -1948,11 +1905,10 @@ function cust_allocations_list_cells($label, $name, $selected=null) function supp_allocations_list_cell($name, $selected=null) { - global $all_items; echo "\n"; $allocs = array( - $all_items=>_("All Types"), + ALL_TEXT=>_("All Types"), '1'=> _("Invoices"), '2'=> _("Overdue Invoices"), '3' => _("Payments"), @@ -1965,11 +1921,10 @@ function supp_allocations_list_cell($name, $selected=null) function supp_transactions_list_cell($name, $selected=null) { - global $all_items; echo "\n"; $allocs = array( - $all_items=>_("All Types"), + ALL_TEXT=>_("All Types"), '6'=>_("GRNs"), '1'=> _("Invoices"), '2'=> _("Overdue Invoices"), @@ -2006,9 +1961,9 @@ function credit_type_list_cells($label, $name, $selected=null, $submit_on_change label_cell($label); echo "\n"; echo array_selector($name, $selected, - array( 'Return' => _("Items Returned to Inventory Location"), - 'WriteOff' => _("Items Written Off")), - array( 'select_submit'=> $submit_on_change ) ); + array( 'Return' => _("Items Returned to Inventory Location"), + 'WriteOff' => _("Items Written Off")), + array( 'select_submit'=> $submit_on_change ) ); echo "\n"; } @@ -2026,8 +1981,8 @@ function number_list($name, $selected, $from, $to, $no_option=false) $items[$i] = "$i"; return array_selector($name, $selected, $items, - array( 'spec_option' => $no_option, - 'spec_id' => ALL_NUMERIC) ); + array( 'spec_option' => $no_option, + 'spec_id' => ALL_NUMERIC) ); } function number_list_cells($label, $name, $selected, $from, $to, $no_option=false) @@ -2171,17 +2126,16 @@ function class_types_list_row($label, $name, $selected_id=null, $submit_on_chang 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 - ) ); + 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, @@ -2202,7 +2156,7 @@ function security_roles_list_row($label, $name, $selected_id=null, $new_item=fal echo "\n"; } -function tab_list_row($label, $name, $selected_id=null, $all = false) +function tab_list_row($label, $name, $selected_id=null) { global $installed_extensions; @@ -2210,12 +2164,6 @@ function tab_list_row($label, $name, $selected_id=null, $all = false) foreach ($_SESSION['App']->applications as $app) { $tabs[$app->id] = access_string($app->name, true); } - if ($all) { // add also not active ext. modules - foreach ($installed_extensions as $ext) { - if ($ext['type'] == 'module' && !$ext['active']) - $tabs[$ext['tab']] = access_string($ext['title'], true); - } - } echo "\n"; echo "$label\n"; echo array_selector($name, $selected_id, $tabs); @@ -2401,11 +2349,44 @@ function tax_algorithm_list_row($label, $name, $value=null, $submit_on_change=fa tax_algorithm_list_cells(null, $name, $value, $submit_on_change); echo "\n"; } + +function refline_list($name, $type, $value=null, $spec_option=false) +{ + $sql = "SELECT id, prefix, inactive FROM ".TB_PREF."reflines"; + + $where = array(); + + if (isset($type)) + $where = array('`trans_type`='.db_escape($type)); + + return combo_input($name, $value, $sql, 'id', 'prefix', + array( + 'order'=>array('prefix'), + 'spec_option' => $spec_option, + 'spec_id' => '', + 'type' => 2, + 'where' => $where, + 'select_submit' => true, + ) + ); +} + +function refline_list_row($label, $name, $type, $selected_id=null, $spec_option=false) +{ + echo ""; + if ($label != null) + echo "$label\n"; + echo ""; + + echo refline_list($name, $type, $selected_id, $spec_option); + echo "\n"; +} + + //---------------------------------------------------------------------------------------------- function subledger_list($name, $account, $selected_id=null) { - global $all_items; $type = is_subledger_account($account); if (!$type) @@ -2449,3 +2430,49 @@ function subledger_list_row($label, $name, $selected_id=null, $all_option = fals echo subledger_list($name, $account, $selected_id); echo "\n\n"; } + +function accounts_type_list_row($label, $name, $selected_id=null) +{ + echo ""; + if ($label != null) + echo "$label\n"; + echo ""; + $sel = array(_("Numeric"), _("Alpha Numeric"), _("ALPHA NUMERIC")); + echo array_selector($name, $selected_id, $sel); + echo "\n"; +} + +function users_list_cells($label, $name, $selected_id=null, $submit_on_change=false, $spec_opt=true) +{ + $where = false; + $sql = " SELECT user_id, real_name FROM ".TB_PREF."users"; + + if ($label != null) + echo "$label\n"; + echo ""; + + echo combo_input($name, $selected_id, $sql, 'user_id', 'real_name', + array( + 'spec_option' => $spec_opt===true ?_("All users") : $spec_opt, + 'spec_id' => '', + 'order' => 'real_name', + 'select_submit'=> $submit_on_change, + 'async' => false + ) ); + echo ""; + +} + +function collations_list_row($label, $name, $selected_id=null) +{ + global $supported_collations; + + echo ""; + if ($label != null) + echo "$label\n"; + echo ""; + + echo array_selector($name, $selected_id, $supported_collations, + array('select_submit'=> false) ); + echo "\n"; +}