X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=5f7601497e2a9850a6b375c24800f4e6cd65b7d7;hb=7e830126b96477e969fe3b48d9fc0e78f6c1fe00;hp=932eaf7ec52bfb9da0ec2e1868263c0ac16718a7;hpb=8c7e9ee8fafeec2061c8a4ed5201d23a3e601b3b;p=fa-stable.git diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index 932eaf7e..5f760149 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -46,9 +46,10 @@ $opts = array( // default options 'sel_hint' => null, 'search_box' => false, // name or true/false 'type' => 0, // type of extended selector: - // 0 - with (optional) visible search box, search by id + // 0 - with (optional) visible search box, search by fragment inside id // 1 - with hidden search box, search by option text - // 2 - TODO reverse: box with hidden selector available via enter; this + // 2 - with (optional) visible search box, search by fragment at the start of id + // 3 - TODO reverse: box with hidden selector available via enter; this // would be convenient for optional ad hoc adding of new item 'search_submit' => true, //search submit button: true/false 'size' => 8, // size and max of box tag @@ -77,8 +78,17 @@ $opts = array( // default options $select_submit = $opts['select_submit']; $spec_id = $opts['spec_id']; $spec_option = $opts['spec_option']; - $by_id = ($opts['type'] == 0); - $class = $by_id ? 'combo':'combo2'; + if ($opts['type'] == 0) { + $by_id = true; + $class = 'combo'; + } elseif($opts['type'] == 1) { + $by_id = false; + $class = 'combo2'; + } else { + $by_id = true; + $class = 'combo3'; + } + $disabled = $opts['disabled'] ? "disabled" : ''; $multi = $opts['multi']; @@ -89,21 +99,20 @@ $opts = array( // default options $opts['sel_hint'] = $by_id || $search_box==false ? '' : _('Press Space tab for search pattern entry'); - if ($opts['box_hint'] === null) // dodaæ hint dla pustego **** + if ($opts['box_hint'] === null) $opts['box_hint'] = $search_box && $search_submit != false ? ($by_id ? _('Enter code fragment to search or * for all') : _('Enter description fragment to search or * for all')) :''; if ($selected_id == null) { - $selected_id = get_post($name, $opts['default']); + $selected_id = get_post($name, (string)$opts['default']); } if(!is_array($selected_id)) - $selected_id = array($selected_id); // code is generalized for multiple selection support + $selected_id = array((string)$selected_id); // code is generalized for multiple selection support $txt = get_post($search_box); $rel = ''; $limit = ''; - if (isset($_POST['_'.$name.'_update'])) { // select list or search box change if ($by_id) $txt = $_POST[$name]; @@ -134,17 +143,19 @@ $opts = array( // default options if ($spec_option === false && $selected_id == array()) $limit = ' LIMIT 1'; else - $opts['where'][] = $valfield . "='". get_post($name, $spec_id)."'"; + $opts['where'][] = $valfield . "=". db_escape(get_post($name, $spec_id)); } else if ($txt != '*') { foreach($opts['search'] as $i=> $s) - $opts['search'][$i] = $s . " LIKE '%{$txt}%'"; + $opts['search'][$i] = $s . " LIKE " + .db_escape(($class=='combo3' ? '' : '%').$txt.'%'); $opts['where'][] = '('. implode($opts['search'], ' OR ') . ')'; } } } + // sql completion if (count($opts['where'])) { $where = strpos($sql, 'WHERE')==false ? ' WHERE ':' AND '; @@ -181,12 +192,13 @@ $opts = array( // default options if (get_post($search_button) && ($txt == $value)) { $selected_id[] = $value; } - if (in_array($value, $selected_id)) { + + if (in_array((string)$value, $selected_id, true)) { $sel = 'selected'; $found = $value; $edit = $opts['editable'] && $contact_row['editable'] && (@$_POST[$search_box] == $value) - ? $descr : false; + ? $contact_row[1] : false; // get non-formatted description if ($edit) break; // selected field is editable - abandon list construction } @@ -228,7 +240,7 @@ $opts = array( // default options $_POST[$name] = $multi ? $selected_id : $selected_id[0]; - $selector = "\n"; @@ -240,7 +252,7 @@ $opts = array( // default options ."\n"; set_focus($name.'_text'); // prevent lost focus - } else if (isset($_POST['_'.$name.'_edit'])) + } else if (get_post($search_submit ? $search_submit : "_{$name}_button")) set_focus($name); // prevent lost focus if (!$opts['editable']) $txt = $found; @@ -249,7 +261,7 @@ $opts = array( // default options $Ajax->addUpdate($name, "_{$name}_sel", $selector); - // span for select list/inut field update + // span for select list/input field update $selector = "".$selector."\n"; // if selectable or editable list is used - add select button @@ -327,7 +339,7 @@ $opts = array( // default options $selected_id = get_post($name, $opts['default']); } if(!is_array($selected_id)) - $selected_id = array($selected_id); // code is generalized for multiple selection support + $selected_id = array((string)$selected_id); // code is generalized for multiple selection support if (isset($_POST[ '_'.$name.'_update'])) { if (!$opts['async']) @@ -343,7 +355,7 @@ $opts = array( // default options //if($name=='SelectStockFromList') display_error($sql); foreach($items as $value=>$descr) { $sel = ''; - if (in_array((string)$value, $selected_id)) { + if (in_array((string)$value, $selected_id, true)) { $sel = 'selected'; $found = $value; } @@ -354,6 +366,10 @@ $opts = array( // default options $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 $first_id = $spec_id; @@ -367,7 +383,8 @@ $opts = array( // default options $selected_id = array($first_id); } $_POST[$name] = $multi ? $selected_id : $selected_id[0]; - $selector = "\n"; @@ -400,6 +417,21 @@ function _format_add_curr($row) '' : (" - " . $row[2])); } +function add_edit_combo($type) +{ + global $path_to_root, $popup_editors, $use_icon_for_editkey; + + if (!isset($use_icon_for_editkey) || $use_icon_for_editkey==0) + return ""; + // Derive theme path + $theme_path = $path_to_root . '/themes/' . user_theme(); + + $key = $popup_editors[$type][1]; + $onclick = "onclick=\"javascript:callEditor($key); return false;\""; + $img = "Add/Edit"; + return "$img"; +} + function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, $all=false, $editkey = false) { @@ -411,8 +443,8 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_ if ($editkey) set_editor('supplier', $name, $editkey); - - return combo_input($name, $selected_id, $sql, 'supplier_id', 'supp_name', + + $ret = combo_input($name, $selected_id, $sql, 'supplier_id', 'supp_name', array( 'format' => '_format_add_curr', 'order' => array('supp_ref'), @@ -426,6 +458,9 @@ function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_ _('Select supplier'), 'show_inactive'=>$all )); + if ($editkey) + $ret .= add_edit_combo('supplier'); + return $ret; } function supplier_list_cells($label, $name, $selected_id=null, $all_option=false, @@ -441,7 +476,7 @@ function supplier_list_cells($label, $name, $selected_id=null, $all_option=false function supplier_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false, $all=false, $editkey = false) { - echo "$label"; + echo "$label"; echo supplier_list($name, $selected_id, $all_option, $submit_on_change, $all, $editkey); echo "\n"; @@ -460,7 +495,7 @@ function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_ if ($editkey) set_editor('customer', $name, $editkey); - return combo_input($name, $selected_id, $sql, 'debtor_no', 'name', + $ret = combo_input($name, $selected_id, $sql, 'debtor_no', 'debtor_ref', array( 'format' => '_format_add_curr', 'order' => array('debtor_ref'), @@ -475,6 +510,9 @@ function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_ _('Select customer'), 'show_inactive' => $show_inactive ) ); + if ($editkey) + $ret .= add_edit_combo('customer'); + return $ret; } function customer_list_cells($label, $name, $selected_id=null, $all_option=false, @@ -491,7 +529,8 @@ function customer_list_cells($label, $name, $selected_id=null, $all_option=false function customer_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false, $show_inactive=false, $editkey = false) { - echo "$label"; + + echo "$label"; echo customer_list($name, $selected_id, $all_option, $submit_on_change, $show_inactive, $editkey); echo "\n\n"; @@ -505,13 +544,13 @@ function customer_branches_list($customer_id, $name, $selected_id=null, global $all_items; $sql = "SELECT branch_code, branch_ref FROM ".TB_PREF."cust_branch - WHERE debtor_no='" . $customer_id . "' "; + WHERE debtor_no=" . db_escape($customer_id)." "; if ($editkey) set_editor('branch', $name, $editkey); $where = $enabled ? array("disable_trans = 0") : array(); - return combo_input($name, $selected_id, $sql, 'branch_code', 'br_name', + $ret = combo_input($name, $selected_id, $sql, 'branch_code', 'branch_ref', array( 'where' => $where, 'order' => array('branch_ref'), @@ -520,6 +559,11 @@ function customer_branches_list($customer_id, $name, $selected_id=null, 'select_submit'=> $submit_on_change, 'sel_hint' => _('Select customer branch') ) ); + if ($editkey) + { + $ret .= add_edit_combo('branch'); + } + return $ret; } //------------------------------------------------------------------------------------------------ @@ -537,8 +581,8 @@ function customer_branches_list_cells($label,$customer_id, $name, $selected_id=n function customer_branches_list_row($label, $customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false, $editkey = false) { - echo ""; - customer_branches_list_cells($label, $customer_id, $name, $selected_id, + echo "$label"; + customer_branches_list_cells(null, $customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change, $editkey); echo ""; } @@ -570,8 +614,8 @@ function locations_list_cells($label, $name, $selected_id=null, $all_option=fals function locations_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) { - echo ""; - locations_list_cells($label, $name, $selected_id, $all_option, $submit_on_change); + echo "$label"; + locations_list_cells(null, $name, $selected_id, $all_option, $submit_on_change); echo "\n"; } @@ -601,8 +645,8 @@ function currencies_list_cells($label, $name, $selected_id=null, $submit_on_chan function currencies_list_row($label, $name, $selected_id=null, $submit_on_change=false) { - echo "\n"; - currencies_list_cells($label, $name, $selected_id, $submit_on_change); + echo "$label"; + currencies_list_cells(null, $name, $selected_id, $submit_on_change); echo "\n"; } @@ -642,8 +686,8 @@ function fiscalyears_list_cells($label, $name, $selected_id=null) function fiscalyears_list_row($label, $name, $selected_id=null) { - echo "\n"; - fiscalyears_list_cells($label, $name, $selected_id); + echo "$label"; + fiscalyears_list_cells(null, $name, $selected_id); echo "\n"; } //------------------------------------------------------------------------------------ @@ -682,8 +726,8 @@ function dimensions_list_cells($label, $name, $selected_id=null, $no_option=fals function dimensions_list_row($label, $name, $selected_id=null, $no_option=false, $showname=null, $showclosed=false, $showtype=0, $submit_on_change=false) { - echo "\n"; - dimensions_list_cells($label, $name, $selected_id, $no_option, $showname, + echo "$label"; + dimensions_list_cells(null, $name, $selected_id, $no_option, $showname, $showclosed, $showtype, $submit_on_change); echo "\n"; } @@ -695,13 +739,13 @@ function stock_items_list($name, $selected_id=null, $all_option=false, { global $all_items; - $sql = "SELECT stock_id, s.description, c.description, s.inactive + $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"; if ($editkey) set_editor('item', $name, $editkey); - return combo_input($name, $selected_id, $sql, 'stock_id', 's.description', + $ret = combo_input($name, $selected_id, $sql, 'stock_id', 's.description', array_merge( array( 'format' => '_format_stock_items', @@ -715,6 +759,9 @@ function stock_items_list($name, $selected_id=null, $all_option=false, 'category' => 2, 'order' => array('c.description','stock_id') ), $opts) ); + if ($editkey) + $ret .= add_edit_combo('item'); + return $ret; } function _format_stock_items($row) @@ -802,7 +849,7 @@ function sales_local_items_list_row($label, $name, $selected_id=null, $all_optio { echo ""; if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; echo sales_items_list($name, $selected_id, $all_option, $submit_on_change, 'local', array('cells'=>false, 'editable' => false)); @@ -830,8 +877,8 @@ function stock_manufactured_items_list_cells($label, $name, $selected_id=null, function stock_manufactured_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) { - echo "\n"; - stock_manufactured_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change); + echo "$label"; + stock_manufactured_items_list_cells(null, $name, $selected_id, $all_option, $submit_on_change); echo "\n"; } //------------------------------------------------------------------------------------ @@ -878,7 +925,9 @@ function stock_purchasable_items_list($name, $selected_id=null, array('where'=>array("mb_flag!= 'M'"), 'show_inactive'=>$all), $editkey); } - +// +// This helper is used in PO/GRN/PI entry and supports editable descriptions. +// function stock_purchasable_items_list_cells($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $editkey=false) { @@ -886,18 +935,19 @@ function stock_purchasable_items_list_cells($label, $name, $selected_id=null, echo "$label\n"; echo stock_items_list($name, $selected_id, $all_option, $submit_on_change, array('where'=>array("mb_flag!= 'M'"), + '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 "\n"; - stock_purchasable_items_list_cells($label, $name, $selected_id=null, + 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) @@ -906,7 +956,7 @@ function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=tr echo ""; if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; echo array_selector($name, $selected_id, $stock_types, @@ -921,7 +971,7 @@ function stock_units_list_row($label, $name, $value=null, $enabled=true) $result = get_all_item_units(); echo ""; if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; while($unit = db_fetch($result)) @@ -960,8 +1010,8 @@ function tax_types_list_cells($label, $name, $selected_id=null, $none_option=fal function tax_types_list_row($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false) { - echo "\n"; - tax_types_list_cells($label, $name, $selected_id, $none_option, $submit_on_change); + echo "$label"; + tax_types_list_cells(null, $name, $selected_id, $none_option, $submit_on_change); echo "\n"; } @@ -993,8 +1043,8 @@ function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=fa function tax_groups_list_row($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false) { - echo "\n"; - tax_groups_list_cells($label, $name, $selected_id, $none_option, $submit_on_change); + echo "$label"; + tax_groups_list_cells(null, $name, $selected_id, $none_option, $submit_on_change); echo "\n"; } @@ -1017,8 +1067,8 @@ function item_tax_types_list_cells($label, $name, $selected_id=null) function item_tax_types_list_row($label, $name, $selected_id=null) { - echo "\n"; - item_tax_types_list_cells($label, $name, $selected_id); + echo "$label"; + item_tax_types_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1042,8 +1092,8 @@ function shippers_list_cells($label, $name, $selected_id=null) function shippers_list_row($label, $name, $selected_id=null) { - echo "\n"; - shippers_list_cells($label, $name, $selected_id); + echo "$label"; + shippers_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1069,8 +1119,8 @@ function sales_persons_list_cells($label, $name, $selected_id=null, $spec_opt=fa function sales_persons_list_row($label, $name, $selected_id=null, $spec_opt=false) { - echo "\n"; - sales_persons_list_cells($label, $name, $selected_id, $spec_opt); + echo "$label"; + sales_persons_list_cells(null, $name, $selected_id, $spec_opt); echo "\n"; } @@ -1093,8 +1143,8 @@ function sales_areas_list_cells($label, $name, $selected_id=null) function sales_areas_list_row($label, $name, $selected_id=null) { - echo "\n"; - sales_areas_list_cells($label, $name, $selected_id); + echo "$label"; + sales_areas_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1120,8 +1170,8 @@ function sales_groups_list_cells($label, $name, $selected_id=null, $special_opti function sales_groups_list_row($label, $name, $selected_id=null, $special_option=false) { - echo "\n"; - sales_groups_list_cells($label, $name, $selected_id, $special_option); + echo "$label"; + sales_groups_list_cells(null, $name, $selected_id, $special_option); echo "\n"; } @@ -1155,8 +1205,8 @@ function templates_list_cells($label, $name, $selected_id=null, $special_option= function templates_list_row($label, $name, $selected_id=null, $special_option=false) { - echo "\n"; - templates_list_cells($label, $name, $selected_id, $special_option); + echo "$label"; + templates_list_cells(null, $name, $selected_id, $special_option); echo "\n"; } @@ -1179,8 +1229,8 @@ function workorders_list_cells($label, $name, $selected_id=null) function workorders_list_row($label, $name, $selected_id=null) { - echo "\n"; - workorders_list_cells($label, $name, $selected_id); + echo "$label"; + workorders_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1203,8 +1253,8 @@ function payment_terms_list_cells($label, $name, $selected_id=null) function payment_terms_list_row($label, $name, $selected_id=null) { - echo "\n"; - payment_terms_list_cells($label, $name, $selected_id); + echo "$label"; + payment_terms_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1227,8 +1277,8 @@ function credit_status_list_cells($label, $name, $selected_id=null) function credit_status_list_row($label, $name, $selected_id=null) { - echo "\n"; - credit_status_list_cells($label, $name, $selected_id); + echo "$label"; + credit_status_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1258,8 +1308,8 @@ function sales_types_list_cells($label, $name, $selected_id=null, $submit_on_cha function sales_types_list_row($label, $name, $selected_id=null, $submit_on_change=false, $special_option=false) { - echo "\n"; - sales_types_list_cells($label, $name, $selected_id, $submit_on_change, $special_option); + echo "$label"; + sales_types_list_cells(null, $name, $selected_id, $submit_on_change, $special_option); echo "\n"; } @@ -1282,8 +1332,8 @@ function movement_types_list_cells($label, $name, $selected_id=null) function movement_types_list_row($label, $name, $selected_id=null) { - echo "\n"; - movement_types_list_cells($label, $name, $selected_id); + echo "$label"; + movement_types_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1350,8 +1400,8 @@ function workcenter_list_cells($label, $name, $selected_id=null, $all_option=fal function workcenter_list_row($label, $name, $selected_id=null, $all_option=false) { - echo "\n"; - workcenter_list_cells($label, $name, $selected_id, $all_option); + echo "$label"; + workcenter_list_cells(null, $name, $selected_id, $all_option); echo "\n"; } @@ -1381,23 +1431,27 @@ function bank_accounts_list_cells($label, $name, $selected_id=null, $submit_on_c function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false) { - echo "\n"; - bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change); + echo "$label"; + bank_accounts_list_cells(null, $name, $selected_id, $submit_on_change); echo "\n"; } //----------------------------------------------------------------------------------------------- -function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false) +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 - WHERE ".TB_PREF."bank_accounts.account_type=3"; + WHERE ".TB_PREF."bank_accounts.account_type=".BT_CASH; if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; 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 @@ -1413,7 +1467,7 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub default_focus($name); echo ''; if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; echo combo_input($name, $selected_id, $sql, 'id', 'pos_name', @@ -1428,13 +1482,35 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub } //----------------------------------------------------------------------------------------------- +// Payment type selector for current user. +// +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"; -function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=false) + if ($category == PM_CASH) // only cash + $sql .= " WHERE days_before_due=0 AND 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 + ) ); + +} + +function sale_payment_list_cells($label, $name, $category, $selected_id=null, $submit_on_change=true, $prepayments=true) { if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; - echo yesno_list($name, $selected_id, _('Cash'), _('Delayed'), $submit_on_change); + + echo sale_payment_list($name, $category, $selected_id, $submit_on_change, $prepayments); + echo "\n"; } //----------------------------------------------------------------------------------------------- @@ -1462,8 +1538,8 @@ function class_list_cells($label, $name, $selected_id=null, $submit_on_change=fa function class_list_row($label, $name, $selected_id=null, $submit_on_change=false) { - echo "\n"; - class_list_cells($label, $name, $selected_id, $submit_on_change); + echo "$label"; + class_list_cells(null, $name, $selected_id, $submit_on_change); echo "\n"; } @@ -1491,14 +1567,14 @@ function stock_categories_list_cells($label, $name, $selected_id=null, $spec_opt function stock_categories_list_row($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false) { - echo "\n"; - stock_categories_list_cells($label, $name, $selected_id, $spec_opt, $submit_on_change); + echo "$label"; + stock_categories_list_cells(null, $name, $selected_id, $spec_opt, $submit_on_change); echo "\n"; } //----------------------------------------------------------------------------------------------- -function gl_account_types_list($name, $selected_id=null, $all_option=false, $all_option_numeric=true) +function gl_account_types_list($name, $selected_id=null, $all_option=false, $all=true) { global $all_items; @@ -1506,28 +1582,27 @@ function gl_account_types_list($name, $selected_id=null, $all_option=false, $all return combo_input($name, $selected_id, $sql, 'id', 'name', array( - 'order' => 'id', + 'format' => '_format_account', + 'order' => array('class_id', 'id', 'parent'), 'spec_option' =>$all_option, - 'spec_id' => $all_option_numeric ? 0 : $all_items + 'spec_id' => $all_items ) ); } -function gl_account_types_list_cells($label, $name, $selected_id=null, $all_option=false, - $all_option_numeric=false) +function gl_account_types_list_cells($label, $name, $selected_id=null, $all_option=false, $all=false) { if ($label != null) echo "$label\n"; echo ""; - echo gl_account_types_list($name, $selected_id, $all_option, $all_option_numeric); + echo gl_account_types_list($name, $selected_id, $all_option, $all); echo "\n"; } -function gl_account_types_list_row($label, $name, $selected_id=null, $all_option=false, - $all_option_numeric=false) +function gl_account_types_list_row($label, $name, $selected_id=null, $all_option=false, $all=false) { - echo "\n"; - gl_account_types_list_cells($label, $name, $selected_id, $all_option, - $all_option_numeric); + echo "$label"; + gl_account_types_list_cells(null, $name, $selected_id, $all_option, + $all); echo "\n"; } @@ -1552,7 +1627,8 @@ 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('type.id','account_code'), + 'type' => 2, + 'order' => array('type.class_id','type.id','account_code'), 'search_box' => $cells, 'search_submit' => false, 'size' => 12, @@ -1586,8 +1662,8 @@ function gl_all_accounts_list_cells($label, $name, $selected_id=null, function gl_all_accounts_list_row($label, $name, $selected_id=null, $skip_bank_accounts=false, $cells=false, $all_option=false) { - echo "\n"; - gl_all_accounts_list_cells($label, $name, $selected_id, + echo "$label"; + gl_all_accounts_list_cells(null, $name, $selected_id, $skip_bank_accounts, $cells, $all_option); echo "\n"; } @@ -1615,37 +1691,38 @@ function yesno_list_cells($label, $name, $selected_id=null, $name_yes="", $name_ function yesno_list_row($label, $name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false) { - echo "\n"; - yesno_list_cells($label, $name, $selected_id, $name_yes, $name_no, $submit_on_change); + echo "$label"; + yesno_list_cells(null, $name, $selected_id, $name_yes, $name_no, $submit_on_change); echo "\n"; } //------------------------------------------------------------------------------------------------ -function languages_list($name, $selected_id=null) +function languages_list($name, $selected_id=null, $all_option=false) { global $installed_languages; $items = array(); + if ($all_option) + $items[''] = $all_option; foreach ($installed_languages as $lang) $items[$lang['code']] = $lang['name']; - return array_selector($name, $selected_id, $items); } -function languages_list_cells($label, $name, $selected_id=null) +function languages_list_cells($label, $name, $selected_id=null, $all_option=false) { if ($label != null) echo "$label\n"; echo ""; - echo languages_list($name, $selected_id); + echo languages_list($name, $selected_id, $all_option); echo "\n"; } -function languages_list_row($label, $name, $selected_id=null) +function languages_list_row($label, $name, $selected_id=null, $all_option=false) { - echo "\n"; - languages_list_cells($label, $name, $selected_id); + echo "$label"; + languages_list_cells(null, $name, $selected_id, $all_option); echo "\n"; } @@ -1669,8 +1746,8 @@ function bank_account_types_list_cells($label, $name, $selected_id=null) function bank_account_types_list_row($label, $name, $selected_id=null) { - echo "\n"; - bank_account_types_list_cells($label, $name, $selected_id); + echo "$label"; + bank_account_types_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1700,8 +1777,8 @@ function payment_person_types_list_cells($label, $name, $selected_id=null, $rela function payment_person_types_list_row($label, $name, $selected_id=null, $related=null) { - echo "\n"; - payment_person_types_list_cells($label, $name, $selected_id, $related); + echo "$label"; + payment_person_types_list_cells(null, $name, $selected_id, $related); echo "\n"; } @@ -1717,7 +1794,7 @@ function wo_types_list($name, $selected_id=null) function wo_types_list_row($label, $name, $selected_id=null) { - echo "$label\n"; + echo "$label\n"; echo wo_types_list($name, $selected_id); echo "\n"; } @@ -1728,7 +1805,7 @@ function dateformats_list_row($label, $name, $value=null) { global $dateformats; - echo "$label\n"; + echo "$label\n"; echo array_selector( $name, $value, $dateformats ); echo "\n"; } @@ -1737,7 +1814,7 @@ function dateseps_list_row($label, $name, $value=null) { global $dateseps; - echo "$label\n"; + echo "$label\n"; echo array_selector( $name, $value, $dateseps ); echo "\n"; } @@ -1746,7 +1823,7 @@ function thoseps_list_row($label, $name, $value=null) { global $thoseps; - echo "$label\n"; + echo "$label\n"; echo array_selector( $name, $value, $thoseps ); echo "\n"; } @@ -1755,7 +1832,7 @@ function decseps_list_row($label, $name, $value=null) { global $decseps; - echo "$label\n"; + echo "$label\n"; echo array_selector( $name, $value, $decseps ); echo "\n"; } @@ -1776,7 +1853,7 @@ function themes_list_row($label, $name, $value=null) } ksort($themes); - echo "$label\n"; + echo "$label\n"; echo array_selector( $name, $value, $themes ); echo "\n"; } @@ -1789,16 +1866,18 @@ function pagesizes_list_row($label, $name, $value=null) foreach ($pagesizes as $pz) $items[$pz] = $pz; - echo "$label\n"; + echo "$label\n"; echo array_selector( $name, $value, $items ); echo "\n"; } -function systypes_list($name, $value=null, $spec_opt=false, $submit_on_change=false) +function systypes_list($name, $value=null, $spec_opt=false, $submit_on_change=false, $exclude=array()) { global $systypes_array; - return array_selector($name, $value, $systypes_array, + // emove non-voidable transactions if needed + $systypes = array_diff_key($systypes_array, array_flip($exclude)); + return array_selector($name, $value, $systypes, array( 'spec_option'=> $spec_opt, 'spec_id' => ALL_NUMERIC, @@ -1808,19 +1887,19 @@ function systypes_list($name, $value=null, $spec_opt=false, $submit_on_change=fa ); } -function systypes_list_cells($label, $name, $value=null, $submit_on_change=false) +function systypes_list_cells($label, $name, $value=null, $submit_on_change=false, $exclude=array()) { if ($label != null) echo "$label\n"; echo ""; - echo systypes_list($name, $value, false, $submit_on_change); + echo systypes_list($name, $value, false, $submit_on_change, $exclude); echo "\n"; } -function systypes_list_row($label, $name, $value=null, $submit_on_change=false) +function systypes_list_row($label, $name, $value=null, $submit_on_change=false, $exclude=array()) { - echo "\n"; - systypes_list_cells($label, $name, $value, false, $submit_on_change); + echo "$label"; + systypes_list_cells(null, $name, $value, $submit_on_change, $exclude); echo "\n"; } @@ -1886,6 +1965,25 @@ function supp_allocations_list_cell($name, $selected=null) echo "\n"; } +function supp_transactions_list_cell($name, $selected=null) +{ + global $all_items; + + echo "\n"; + $allocs = array( + $all_items=>_("All Types"), + '6'=>_("GRNs"), + '1'=> _("Invoices"), + '2'=> _("Overdue Invoices"), + '3' => _("Payments"), + '4' => _("Credit Notes"), + '5' => _("Overdue Credit Notes") + ); + + echo array_selector($name, $selected, $allocs); + echo "\n"; +} + function policy_list_cells($label, $name, $selected=null) { if ($label != null) @@ -1899,8 +1997,8 @@ function policy_list_cells($label, $name, $selected=null) function policy_list_row($label, $name, $selected=null) { - echo "\n"; - policy_list_cells($label, $name, $selected); + echo "$label"; + policy_list_cells(null, $name, $selected); echo "\n"; } @@ -1918,8 +2016,8 @@ function credit_type_list_cells($label, $name, $selected=null, $submit_on_change function credit_type_list_row($label, $name, $selected=null, $submit_on_change=false) { - echo "\n"; - credit_type_list_cells($label, $name, $selected, $submit_on_change); + echo "$label"; + credit_type_list_cells(null, $name, $selected, $submit_on_change); echo "\n"; } @@ -1945,8 +2043,8 @@ function number_list_cells($label, $name, $selected, $from, $to, $no_option=fals function number_list_row($label, $name, $selected, $from, $to, $no_option=false) { - echo "\n"; - echo number_list_cells($label, $name, $selected, $from, $to, $no_option); + echo "$label"; + echo number_list_cells(null, $name, $selected, $from, $to, $no_option); echo "\n"; } @@ -1963,7 +2061,7 @@ function print_profiles_list_row($label, $name, $selected_id=null, $spec_opt=fal echo ""; if ($label != null) - echo "$label\n"; + echo "$label\n"; echo ""; echo array_selector($name, $selected_id, $profiles, @@ -2015,15 +2113,17 @@ function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_cha function quick_entries_list_cells($label, $name, $selected_id=null, $type, $submit_on_change=false) { - echo "$label\n"; + if ($label != null) + echo "$label\n"; + echo ""; echo quick_entries_list($name, $selected_id, $type, $submit_on_change); echo ""; } function quick_entries_list_row($label, $name, $selected_id=null, $type, $submit_on_change=false) { - echo "\n"; - quick_entries_list_cells($label, $name, $selected_id, $type, $submit_on_change); + echo "$label"; + quick_entries_list_cells(null, $name, $selected_id, $type, $submit_on_change); echo "\n"; } @@ -2032,7 +2132,7 @@ function quick_actions_list_row($label, $name, $selected_id=null, $submit_on_cha { global $quick_actions; - echo "$label"; + echo "$label"; echo array_selector($name, $selected_id, $quick_actions, array( 'select_submit'=> $submit_on_change @@ -2044,7 +2144,7 @@ function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on { global $quick_entry_types; - echo "$label"; + echo "$label"; echo array_selector($name, $selected_id, $quick_entry_types, array( 'select_submit'=> $submit_on_change @@ -2060,7 +2160,7 @@ function class_types_list_row($label, $name, $selected_id=null, $submit_on_chang { global $class_types; - echo "$label"; + echo "$label"; echo array_selector($name, $selected_id, $class_types, array( 'select_submit'=> $submit_on_change @@ -2099,8 +2199,8 @@ function security_roles_list_cells($label, $name, $selected_id=null, $new_item=f function security_roles_list_row($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false, $show_inactive = false) { - echo ""; - security_roles_list_cells($label, $name, $selected_id, $new_item, $submit_on_change, $show_inactive); + echo "$label"; + security_roles_list_cells(null, $name, $selected_id, $new_item, $submit_on_change, $show_inactive); echo "\n"; } @@ -2119,7 +2219,7 @@ function tab_list_row($label, $name, $selected_id=null, $all = false) } } echo "\n"; - echo "$label\n"; + echo "$label\n"; echo array_selector($name, $selected_id, $tabs); echo "\n"; } @@ -2161,8 +2261,8 @@ function tag_list_cells($label, $name, $height, $type, $mult=false, $all=false, function tag_list_row($label, $name, $height, $type, $mult=false, $all=false, $spec_opt = false) { - echo "\n"; - tag_list_cells($label, $name, $height, $type, $mult, $all, $spec_opt); + echo "$label"; + tag_list_cells(null, $name, $height, $type, $mult, $all, $spec_opt); echo "\n"; } @@ -2185,4 +2285,169 @@ function extset_list($name, $value=null, $submit_on_change=false) )); } -?> \ No newline at end of file +function crm_category_types_list($name, $selected_id=null, $filter=array(), $submit_on_change=true) +{ + + $sql = "SELECT id, name, type, inactive FROM ".TB_PREF."crm_categories"; + + $multi = false; + $groups = false; + $where = array(); + if (@$filter['class']) { + $where[] = 'type='.db_escape($filter['class']); + } else + $groups = 'type'; + if (@$filter['subclass']) $where[] = 'action='.db_escape($filter['subclass']); + if (@$filter['entity']) $where[] = 'entity_id='.db_escape($filter['entity']); + if (@$filter['multi']) { // contact category selector for person + $multi = true; + } + + return combo_input($name, $selected_id, $sql, 'id', 'name', + array( + 'multi' => $multi, + 'height' => $multi ? 5:1, + 'category' => $groups, + 'select_submit'=> $submit_on_change, + 'async' => true, + 'where' => $where + )); +} + +function crm_category_types_list_row($label, $name, $selected_id=null, $filter=array(), $submit_on_change=true) +{ + echo "$label"; + echo crm_category_types_list($name, $selected_id, $filter, $submit_on_change); + echo "\n"; +} + +function payment_type_list_row($label, $name, $selected_id=null, $submit_on_change=false) +{ + global $pterm_types; + + echo "$label"; + echo array_selector($name, $selected_id, $pterm_types, + array( + 'select_submit'=> $submit_on_change + ) ); + echo "\n"; +} + +function coa_list_row($label, $name, $value=null) +{ + global $path_to_root, $installed_extensions; + + $path = $path_to_root.'/sql/'; + $coas = array(); + $sqldir = opendir($path); + while (false !== ($fname = readdir($sqldir))) + { + if (is_file($path.$fname) && substr($fname,-4)=='.sql' && @($fname[2] == '_')) + { + $ext = array_search_value($fname, $installed_extensions, 'sql'); + if ($ext!=null) { + $descr = $ext['name']; + } elseif ($fname == 'en_US-new.sql') { // two standard COAs + $descr = _("Standard new company American COA (4 digit)"); + } elseif ($fname == 'en_US-demo.sql') { + $descr = _("Standard American COA (4 digit) with demo data"); + } else + $descr = $fname; + + $coas[$fname] = $descr; + } + } + ksort($coas); + + echo "$label\n"; + echo array_selector( $name, $value, $coas ); + echo "\n"; +} + +function payment_services($name) +{ + global $payment_services; + + $services = array_combine(array_keys($payment_services), array_keys($payment_services)); + + return array_selector($name, null, $services, array( + 'spec_option'=> _("No payment Link"), + 'spec_id' => '', + )); +} + +function tax_algorithm_list($name, $value=null, $submit_on_change = false) +{ + global $tax_algorithms; + + return array_selector($name, $value, $tax_algorithms, + array( + 'select_submit'=> $submit_on_change, + 'async' => true, + ) + ); +} + +function tax_algorithm_list_cells($label, $name, $value=null, $submit_on_change=false) +{ + if ($label != null) + echo "$label\n"; + echo ""; + echo tax_algorithm_list($name, $value, $submit_on_change); + echo "\n"; +} + +function tax_algorithm_list_row($label, $name, $value=null, $submit_on_change=false) +{ + echo "$label"; + tax_algorithm_list_cells(null, $name, $value, $submit_on_change); + echo "\n"; +} +//---------------------------------------------------------------------------------------------- + +function subledger_list($name, $account, $selected_id=null) +{ + global $all_items; + + $type = is_subledger_account($account); + if (!$type) + return ''; + + if($type > 0) + $sql = "SELECT DISTINCT d.debtor_no as id, debtor_ref as name + FROM " + .TB_PREF."debtors_master d," + .TB_PREF."cust_branch c + WHERE d.debtor_no=c.debtor_no AND c.receivables_account=".db_escape($account); + else + $sql = "SELECT supplier_id as id, supp_ref as name + FROM " + .TB_PREF."suppliers s + WHERE s.payable_account=".db_escape($account); + + $mode = get_company_pref('no_customer_list'); + + return combo_input($name, $selected_id, $sql, 'id', 'name', + array( + 'type' => 1, + 'size' => 20, + 'async' => false, + ) ); +} + +function subledger_list_cells($label, $name, $account, $selected_id=null) +{ + if ($label != null) + echo "$label\n"; + echo ""; + echo subledger_list($name, $account, $selected_id); + echo "\n"; +} + +function subledger_list_row($label, $name, $selected_id=null, $all_option = false, + $submit_on_change=false, $show_inactive=false, $editkey = false) +{ + echo "$label"; + echo subledger_list($name, $account, $selected_id); + echo "\n\n"; +}