X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=45253e32fd01c20585149b7fb935d012d4d7d051;hb=c9cb6e8b05e007305888f244807abda14632205e;hp=9ea529965d026c3a51d782d0426cd94c2cccd32b;hpb=f3d80f9786ca39bf7894bc8797f524e57fae2bbe;p=fa-stable.git diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index 9ea52996..45253e32 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -150,7 +150,7 @@ $opts = array( // default options foreach($opts['search'] as $i=> $s) $opts['search'][$i] = $s . " LIKE " .db_escape(($class=='combo3' ? '' : '%').$txt.'%'); - $opts['where'][] = '('. implode($opts['search'], ' OR ') . ')'; + $opts['where'][] = '('. implode(' OR ', $opts['search']) . ')'; } } } @@ -158,7 +158,7 @@ $opts = array( // default options // sql completion if (count($opts['where'])) { $where = strpos($sql, 'WHERE')==false ? ' WHERE ':' AND '; - $where .= '('. implode($opts['where'], ' AND ') . ')'; + $where .= '('. implode(' AND ', $opts['where']) . ')'; $group_pos = strpos($sql, 'GROUP BY'); if ($group_pos) { $group = substr($sql, $group_pos); @@ -302,53 +302,57 @@ $opts = array( // default options $link = ""; $id = $name; if ($SysPrefs->use_popup_windows) { - switch (strtolower($type)) { - case "stock": - $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=all&client_id=" . $id; - $img_title = _("Search items"); - break; - case "stock_manufactured": - $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=manufactured&client_id=" . $id; - $img_title = _("Search items"); - break; - case "stock_purchased": - $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=purchasable&client_id=" . $id; - $img_title = _("Search items"); - break; - case "stock_sales": - $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=sales&client_id=" . $id; - $img_title = _("Search items"); - break; - case "stock_costable": - $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=costable&client_id=" . $id; - $img_title = _("Search items"); - break; - case "component": - $parent = $opts['parent']; - $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=component&parent=".$parent."&client_id=" . $id; - $img_title = _("Search items"); - break; - case "kits": - $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=kits&client_id=" . $id; - $img_title = _("Search items"); - break; - case "customer": - $link = $path_to_root . "/sales/inquiry/customers_list.php?popup=1&client_id=" . $id; - $img_title = _("Search customers"); - break; - case "branch": - $link = $path_to_root . "/sales/inquiry/customer_branches_list.php?popup=1&client_id=" . $id . "#customer_id"; - $img_title = _("Search branches"); - break; - case "supplier": - $link = $path_to_root . "/purchasing/inquiry/suppliers_list.php?popup=1&client_id=" . $id; - $img_title = _("Search suppliers"); - break; - case "account": - $link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&client_id=" . $id; - $img_title = _("Search GL accounts"); - break; - } + if ($type != NULL) { + switch (strtolower($type)) { + case "stock": + $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=all&client_id=" . $id; + $img_title = _("Search items"); + break; + case "stock_manufactured": + $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=manufactured&client_id=" . $id; + $img_title = _("Search items"); + break; + case "stock_purchased": + $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=purchasable&client_id=" . $id; + $img_title = _("Search items"); + break; + case "stock_sales": + $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=sales&client_id=" . $id; + $img_title = _("Search items"); + break; + case "stock_costable": + $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=costable&client_id=" . $id; + $img_title = _("Search items"); + break; + case "component": + $parent = $opts['parent']; + $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=component&parent=".$parent."&client_id=" . $id; + $img_title = _("Search items"); + break; + case "kits": + $link = $path_to_root . "/inventory/inquiry/stock_list.php?popup=1&type=kits&client_id=" . $id; + $img_title = _("Search items"); + break; + case "customer": + $link = $path_to_root . "/sales/inquiry/customers_list.php?popup=1&client_id=" . $id; + $img_title = _("Search customers"); + break; + case "branch": + $link = $path_to_root . "/sales/inquiry/customer_branches_list.php?popup=1&client_id=" . $id . "#customer_id"; + $img_title = _("Search branches"); + break; + case "supplier": + $link = $path_to_root . "/purchasing/inquiry/suppliers_list.php?popup=1&client_id=" . $id; + $img_title = _("Search suppliers"); + break; + case "account": + case "account2": + $skip = strtolower($type) == "account" ? false : true; + $link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&skip=".$skip."&client_id=" . $id; + $img_title = _("Search GL accounts"); + break; + } + } } if ($link !=="") { @@ -363,7 +367,7 @@ $opts = array( // default options $selector .= ' '.$opts['editlink']; if ($search_box && $opts['cells']) - $str = ($edit_entry!='' ? "$edit_entry" : '')."$selector$img"; + $str = ($edit_entry!='' ? "$edit_entry" : '')."$selector$img"; else $str = $edit_entry.$selector.$img; return $str; @@ -551,10 +555,11 @@ 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"; - echo supplier_list($name, $selected_id, $all_option, $submit_on_change, + echo "$label\n"; + echo ""; + echo supplier_list($name, $selected_id, $all_option, $submit_on_change, $all, $editkey); - echo "\n"; + echo "\n"; } function supplier_list_row($label, $name, $selected_id=null, $all_option = false, @@ -941,7 +946,7 @@ function sales_items_list_cells($label, $name, $selected_id=null, $all_option=fa if ($label != null) echo "$label\n"; echo sales_items_list($name, $selected_id, $all_option, $submit_on_change, - '', array('cells'=>true)); + '', array('cells'=>true, 'max'=>50)); // maximum is set to 50 and not default 255. } function sales_kits_list($name, $selected_id=null, $all_option=false, $submit_on_change=false) @@ -1149,11 +1154,12 @@ function stock_depreciable_fa_list_cells($label, $name, $selected_id=null, ( SELECT stock_id FROM ".TB_PREF."stock_moves WHERE (type=".ST_CUSTDELIVERY." OR type=".ST_INVADJUST.") AND qty!=0 )"; $year = get_current_fiscalyear(); - $y = date('Y', strtotime($year['end'])); + $begin = date2sql(add_months(sql2date($year['begin']), -1)); + $end = date2sql(add_months(sql2date($year['end']), -1)); // check if current fiscal year - $where_opts[] = "depreciation_date < '".$y."-12-01'"; - $where_opts[] = "depreciation_date >= '".($y-1)."-12-01'"; + $where_opts[] = "depreciation_date <= '".$end."'"; + $where_opts[] = "depreciation_date >= '".$begin."'"; $where_opts[] = "material_cost > 0"; $where_opts[] = "mb_flag='F'"; @@ -1202,7 +1208,7 @@ function tax_types_list_row($label, $name, $selected_id=null, $none_option=false function tax_groups_list($name, $selected_id=null, $none_option=false, $submit_on_change=false) { - $sql = "SELECT id, name FROM ".TB_PREF."tax_groups"; + $sql = "SELECT id, name, inactive FROM ".TB_PREF."tax_groups"; return combo_input($name, $selected_id, $sql, 'id', 'name', array( @@ -1232,25 +1238,28 @@ function tax_groups_list_row($label, $name, $selected_id=null, $none_option=fals //------------------------------------------------------------------------------------ -function item_tax_types_list($name, $selected_id=null) +function item_tax_types_list($name, $selected_id=null, $show_inactive = false) { $sql ="SELECT id, name FROM ".TB_PREF."item_tax_types"; + if (!$show_inactive) + $sql .= " WHERE !inactive"; + return combo_input($name, $selected_id, $sql, 'id', 'name', array('order' => 'id') ); } -function item_tax_types_list_cells($label, $name, $selected_id=null) +function item_tax_types_list_cells($label, $name, $selected_id=null, $show_inactive = false) { if ($label != null) echo "$label\n"; echo ""; - echo item_tax_types_list($name, $selected_id); + echo item_tax_types_list($name, $selected_id, $show_inactive); echo "\n"; } -function item_tax_types_list_row($label, $name, $selected_id=null) +function item_tax_types_list_row($label, $name, $selected_id=null, $show_inactive = false) { echo "$label"; - item_tax_types_list_cells(null, $name, $selected_id); + item_tax_types_list_cells(null, $name, $selected_id, $show_inactive); echo "\n"; } @@ -1308,25 +1317,27 @@ function sales_persons_list_row($label, $name, $selected_id=null, $spec_opt=fals //------------------------------------------------------------------------------------ -function sales_areas_list($name, $selected_id=null) +function sales_areas_list($name, $selected_id=null, $special_option=false) { $sql = "SELECT area_code, description, inactive FROM ".TB_PREF."areas"; - return combo_input($name, $selected_id, $sql, 'area_code', 'description', array()); + return combo_input($name, $selected_id, $sql, 'area_code', 'description', + array('spec_option' => $special_option===true ? ' ' : $special_option, + 'order' => 'description', 'spec_id' => 0)); } -function sales_areas_list_cells($label, $name, $selected_id=null) +function sales_areas_list_cells($label, $name, $selected_id=null, $special_option=false) { if ($label != null) echo "$label\n"; echo ""; - echo sales_areas_list($name, $selected_id); + echo sales_areas_list($name, $selected_id, $special_option); echo "\n"; } -function sales_areas_list_row($label, $name, $selected_id=null) +function sales_areas_list_row($label, $name, $selected_id=null, $special_option=false) { echo "$label"; - sales_areas_list_cells(null, $name, $selected_id); + sales_areas_list_cells(null, $name, $selected_id, $special_option); echo "\n"; } @@ -1334,7 +1345,7 @@ function sales_areas_list_row($label, $name, $selected_id=null) function sales_groups_list($name, $selected_id=null, $special_option=false) { - $sql = "SELECT id, description, inactive FROM ".TB_PREF."groups"; + $sql = "SELECT id, description, inactive FROM `".TB_PREF."groups`"; return combo_input($name, $selected_id, $sql, 'id', 'description', array( 'spec_option' => $special_option===true ? ' ' : $special_option, 'order' => 'description', 'spec_id' => 0, @@ -1802,7 +1813,7 @@ function gl_account_types_list_row($label, $name, $selected_id=null, $all_option //----------------------------------------------------------------------------------------------- function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=false, - $cells=false, $all_option=false, $submit_on_change=false, $all=false) + $cells=false, $all_option=false, $submit_on_change=false, $all=false, $type_id=false) { if ($skip_bank_accounts) $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id @@ -1815,7 +1826,8 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals $sql = "SELECT chart.account_code, chart.account_name, type.name, chart.inactive, type.id FROM ".TB_PREF."chart_master chart,".TB_PREF."chart_types type WHERE chart.account_type=type.id"; - + if ($type_id ) $sql .= " AND chart.account_type=".db_escape($type_id); + $account = ($skip_bank_accounts ? "account2" : "account"); return combo_input($name, $selected_id, $sql, 'chart.account_code', 'chart.account_name', array( 'format' => '_format_account', @@ -1832,7 +1844,7 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals 'async' => false, 'category' => 2, 'show_inactive' => $all - ), "account" ); + ), $account ); } function _format_account($row) @@ -1842,22 +1854,22 @@ function _format_account($row) function gl_all_accounts_list_cells($label, $name, $selected_id=null, $skip_bank_accounts=false, $cells=false, $all_option=false, - $submit_on_change=false, $all=false) + $submit_on_change=false, $all=false, $type_id=false) { if ($label != null) echo "$label\n"; echo ""; echo gl_all_accounts_list($name, $selected_id, - $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all); + $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all, $type_id); echo "\n"; } function gl_all_accounts_list_row($label, $name, $selected_id=null, - $skip_bank_accounts=false, $cells=false, $all_option=false) + $skip_bank_accounts=false, $cells=false, $all_option=false, $submit_on_change=false, $all=false, $type_id=false) { echo "$label"; gl_all_accounts_list_cells(null, $name, $selected_id, - $skip_bank_accounts, $cells, $all_option); + $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all, $type_id); echo "\n"; } @@ -2300,7 +2312,7 @@ 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) +function quick_entries_list_cells($label, $name, $selected_id, $type, $submit_on_change=false) { if ($label != null) echo "$label\n"; @@ -2309,7 +2321,7 @@ function quick_entries_list_cells($label, $name, $selected_id=null, $type, $subm echo ""; } -function quick_entries_list_row($label, $name, $selected_id=null, $type, $submit_on_change=false) +function quick_entries_list_row($label, $name, $selected_id, $type, $submit_on_change=false) { echo "$label"; quick_entries_list_cells(null, $name, $selected_id, $type, $submit_on_change); @@ -2633,12 +2645,12 @@ function subledger_list($name, $account, $selected_id=null) 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); + WHERE d.debtor_no=c.debtor_no AND NOT d.inactive 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); + WHERE NOT s.inactive AND s.payable_account=".db_escape($account); $mode = get_company_pref('no_customer_list'); @@ -2681,7 +2693,7 @@ function accounts_type_list_row($label, $name, $selected_id=null) 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"; + $sql = " SELECT user_id, IF(real_name = '', user_id, real_name) FROM ".TB_PREF."users"; if ($label != null) echo "$label\n";