X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=8e4da29d0f467e6e59cf4874cc9b8a532661fd91;hb=d32bf132413c22c5a19966160fcd574346f63b24;hp=9cb41a4863e43bfd0f51e9c04986cde894ea0502;hpb=658a1ea0bde1951d966ff0560e24a62e3cdde6e6;p=fa-stable.git diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index 9cb41a48..8e4da29d 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -180,11 +180,14 @@ $opts = array( // default options $found = false; $lastcat = null; $edit = false; + $pname = false; + if (($type === "customer" || $type === "supplier") && !empty($SysPrefs->prefs['shortname_name_in_list'])) + $pname = true; if($result = db_query($sql)) { while ($contact_row = db_fetch($result)) { $value = $contact_row[0]; $descr = $opts['format']==null ? $contact_row[1] : - call_user_func($opts['format'], $contact_row); + call_user_func($opts['format'], $contact_row, $pname); $sel = ''; if (get_post($search_button) && ($txt == $value)) { $selected_id[] = $value; @@ -293,7 +296,7 @@ $opts = array( // default options default_focus(($search_box && $by_id) ? $search_box : $name); $img = ""; - if ($SysPrefs->use_popup_search && !isset($opts['fixed_asset'])) + if ($SysPrefs->use_popup_search && (!isset($opts['fixed_asset']) || !$opts['fixed_asset'])) { $img_title = ""; $link = ""; @@ -342,7 +345,9 @@ $opts = array( // default options $img_title = _("Search suppliers"); break; case "account": - $link = $path_to_root . "/gl/inquiry/accounts_list.php?popup=1&client_id=" . $id; + 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; } @@ -478,7 +483,7 @@ function array_selector_row($label, $name, $selected_id, $items, $options=null) } //---------------------------------------------------------------------------------------------- -function _format_add_curr($row) +function _format_add_curr($row, $pname=false) { static $company_currency; @@ -486,8 +491,14 @@ function _format_add_curr($row) { $company_currency = get_company_currency(); } - return $row[1] . ($row[2] == $company_currency ? - '' : (" - " . $row[2])); + if (!$pname) + { + return $row[1] . ($row[2] == $company_currency ? '' : (" - " . $row[2])); + } + else + { + return $row[1] . " - " . $row[2] . ($row[3] == $company_currency ? '' : (" - " . $row[3])); + } } function add_edit_combo($type) @@ -508,8 +519,11 @@ function add_edit_combo($type) function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, $all=false, $editkey = false) { - - $sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers "; + global $SysPrefs; + if (!empty($SysPrefs->prefs['shortname_name_in_list'])) + $sql = "SELECT supplier_id, supp_ref, supp_name, curr_code, inactive FROM ".TB_PREF."suppliers "; + else + $sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers "; $mode = get_company_pref('no_supplier_list'); @@ -539,10 +553,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, @@ -558,8 +573,11 @@ 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) { - - $sql = "SELECT debtor_no, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master "; + global $SysPrefs; + if (!empty($SysPrefs->prefs['shortname_name_in_list'])) + $sql = "SELECT debtor_no, debtor_ref, name, curr_code, inactive FROM ".TB_PREF."debtors_master "; + else + $sql = "SELECT debtor_no, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master "; $mode = get_company_pref('no_customer_list'); @@ -687,16 +705,18 @@ function locations_list_row($label, $name, $selected_id=null, $all_option=false, //----------------------------------------------------------------------------------------------- -function currencies_list($name, $selected_id=null, $submit_on_change=false) +function currencies_list($name, $selected_id=null, $submit_on_change=false, $exclude_home_curr=false) { $sql = "SELECT curr_abrev, currency, inactive FROM ".TB_PREF."currencies"; + if ($exclude_home_curr) + $sql .= " WHERE curr_abrev!='".get_company_currency()."'"; // 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 + 'async' => false ) ); } @@ -822,7 +842,7 @@ function stock_items_list($name, $selected_id=null, $all_option=false, 'spec_id' => ALL_TEXT, 'search_box' => true, 'search' => array("stock_id", "c.description","s.description"), - 'search_submit' => get_company_pref('no_item_list')!=0 && !isset($opts['fixed_asset']), + 'search_submit' => get_company_pref('no_item_list')!=0 && (!isset($opts['fixed_asset']) || !$opts['fixed_asset']), 'size'=>10, 'select_submit'=> $submit_on_change, 'category' => 2, @@ -985,8 +1005,9 @@ function stock_component_items_list_cells($label, $name, $parent_stock_id, { if ($label != null) echo "$label\n"; + $parent = db_escape($parent_stock_id); echo stock_items_list($name, $selected_id, $all_option, $submit_on_change, - array('where'=>array("stock_id != $parent"), 'cells'=>true, 'parent'=> $parent_stock_id), $editkey, "component"); + array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true, 'parent'=> $parent_stock_id), $editkey, "component"); } //------------------------------------------------------------------------------------ @@ -1131,11 +1152,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'"; @@ -1184,7 +1206,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( @@ -1214,25 +1236,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"; } @@ -1290,25 +1315,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"; } @@ -1784,7 +1811,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 @@ -1797,7 +1824,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', @@ -1814,7 +1842,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) @@ -1824,22 +1852,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, $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, $type_id); echo "\n"; } @@ -2103,7 +2131,7 @@ function journal_types_list_cells($label, $name, $value=null, $submit_on_change= echo "\n"; } -function cust_allocations_list_cells($label, $name, $selected=null) +function cust_allocations_list_cells($label, $name, $selected=null, $submit_on_change=false) { if ($label != null) @@ -2112,12 +2140,12 @@ function cust_allocations_list_cells($label, $name, $selected=null) $allocs = array( ALL_TEXT=>_("All Types"), '1'=> _("Sales Invoices"), - '2'=> _("Overdue Invoices"), + '2'=> _("Unsettled transactions"), '3' => _("Payments"), '4' => _("Credit Notes"), '5' => _("Delivery Notes") ); - echo array_selector($name, $selected, $allocs); + echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change)); echo "\n"; } @@ -2137,7 +2165,7 @@ function supp_allocations_list_cell($name, $selected=null) echo "\n"; } -function supp_transactions_list_cell($name, $selected=null) +function supp_transactions_list_cell($name, $selected=null, $submit_on_change=false) { echo "\n"; @@ -2145,13 +2173,13 @@ function supp_transactions_list_cell($name, $selected=null) ALL_TEXT=>_("All Types"), '6'=>_("GRNs"), '1'=> _("Invoices"), - '2'=> _("Overdue Invoices"), + '2'=> _("Unsettled transactions"), '3' => _("Payments"), '4' => _("Credit Notes"), '5' => _("Overdue Credit Notes") ); - echo array_selector($name, $selected, $allocs); + echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change)); echo "\n"; } @@ -2532,7 +2560,7 @@ function payment_services($name) { global $payment_services; - $services = array_combine(array_keys($payment_services), array_keys($payment_services)); + $services = (object)array_combine(array_keys($payment_services), array_keys($payment_services)); return array_selector($name, null, $services, array( 'spec_option'=> _("No payment Link"), @@ -2615,12 +2643,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'); @@ -2663,7 +2691,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";