X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freports_classes.inc;h=530add3d1124cbd5e46fb5f391320fb0561a6535;hb=bb583790fe61f0fbf254783e571b95390c28644d;hp=2b1c6d5557965eff7dd4f7b507545084de3fd678;hpb=0da4935c1fb5b588bfd7ead31f05069c9566eb8d;p=fa-stable.git diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc index 2b1c6d55..530add3d 100644 --- a/reporting/includes/reports_classes.inc +++ b/reporting/includes/reports_classes.inc @@ -134,8 +134,8 @@ class Report switch ($param->param_type) { case 'CURRENCY': - $sql = "SELECT curr_abrev, concat(curr_abrev,' - ', currency) FROM ".TB_PREF."currencies"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Currency Filter")); + $sql = "SELECT curr_abrev, concat(curr_abrev,' - ', currency) AS name FROM ".TB_PREF."currencies"; + $st .= combo_input("PARAM_$index", '', $sql, 'curr_abrev', 'name',array('spec_option'=>_("No Currency Filter"),'spec_id'=>ALL_TEXT,'order'=>false)); break; case 'DATE': case 'DATEBEGIN': @@ -207,69 +207,75 @@ class Report $st .= ""; break; case 'ACCOUNTS': - $sql = "SELECT id, name FROM ".TB_PREF."chart_types ORDER BY name"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Account Group Filter"), true); + $sql = "SELECT id, name FROM ".TB_PREF."chart_types"; + $st .= combo_input("PARAM_$index", '', $sql, 'id', 'name',array('spec_option'=>_("No Account Group Filter"),'spec_id'=>ALL_NUMERIC)); + break; + case 'ACCOUNTS_NO_FILTER': + $sql = "SELECT id, name FROM ".TB_PREF."chart_types"; + $st .= combo_input("PARAM_$index", '', $sql, 'id', 'name', null); break; case 'GL_ACCOUNTS': - $sql = "SELECT account_code, concat(account_code, ' - ', account_name) as account_name FROM ".TB_PREF."chart_master ORDER BY account_code"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + $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"; + $st .= combo_input("PARAM_$index", '', $sql, 'chart.account_code', 'chart.account_name', + array('format' => '_format_account','order' => array('type.id','account_code'),'async' => false,'category' => 2)); break; case 'BANK_ACCOUNTS': - $sql = "SELECT ".TB_PREF."bank_accounts.id, concat(bank_account_name, if (bank_curr_code=curr_default,'', concat(' - ', bank_curr_code))) FROM ".TB_PREF."bank_accounts, ".TB_PREF."company"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + $sql = "SELECT ".TB_PREF."bank_accounts.id, concat(bank_account_name, if (bank_curr_code=curr_default,'', concat(' - ', bank_curr_code))) AS name FROM ".TB_PREF."bank_accounts, ".TB_PREF."company"; + $st .= combo_input("PARAM_$index", '', $sql, 'id', 'name',array('order'=>array('id'))); break; case 'DIMENSION': - $sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions ORDER BY reference"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + $sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions"; + $st .= combo_input("PARAM_$index", '', $sql, 'id', 'DimName',array('order'=>array('reference'))); break; case 'DIMENSIONS': - $sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions ORDER BY reference"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Dimension Filter"), true); + $sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions"; + $st .= combo_input("PARAM_$index", '', $sql, 'id', 'DimName',array('spec_option'=>_("No Dimension Filter"),'spec_id'=>ALL_NUMERIC,'order'=>array('reference'))); break; case 'DIMENSION1': - $sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=1 ORDER BY reference"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index". "_$index", $dummy); + $sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=1"; + $st .= combo_input("PARAM_$index", '', $sql, 'id', 'DimName',array('order'=>array('reference'))); break; case 'DIMENSIONS1': - $sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=1 ORDER BY reference"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Dimension Filter"), true); + $sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=1"; + $st .= combo_input("PARAM_$index", '', $sql, 'id', 'DimName',array('spec_option'=>_("No Dimension Filter"),'spec_id'=>ALL_NUMERIC,'order'=>array('reference'))); break; case 'DIMENSION2': - $sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=2 ORDER BY reference"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + $sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=2"; + $st .= combo_input("PARAM_$index", '', $sql, 'id', 'DimName',array('order'=>array('reference'))); break; case 'DIMENSIONS2': - $sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=2 ORDER BY reference"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Dimension Filter"), true); + $sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=2"; + $st .= combo_input("PARAM_$index", '', $sql, 'id', 'DimName',array('spec_option'=>_("No Dimension Filter"),'spec_id'=>ALL_NUMERIC,'order'=>array('reference'))); break; case 'CUSTOMERS_NO_FILTER': case 'CUSTOMERS': - $sql = "SELECT debtor_no, name FROM ".TB_PREF."debtors_master ORDER BY name"; + $sql = "SELECT debtor_no, name FROM ".TB_PREF."debtors_master"; if ($param->param_type == 'CUSTOMERS_NO_FILTER') - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Customer Filter"), true); + $st .= combo_input("PARAM_$index", '', $sql, 'debtor_no', 'name',array('spec_option'=>_("No Customer Filter"),'spec_id'=>ALL_NUMERIC)); else - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + $st .= combo_input("PARAM_$index", '', $sql, 'debtor_no', 'name', null); break; case 'SUPPLIERS_NO_FILTER': case 'SUPPLIERS': - $sql = "SELECT supplier_id, supp_name FROM ".TB_PREF."suppliers ORDER BY supp_name"; + $sql = "SELECT supplier_id, supp_name FROM ".TB_PREF."suppliers"; if ($param->param_type == 'SUPPLIERS_NO_FILTER') - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Supplier Filter"), true); + $st .= combo_input("PARAM_$index", '', $sql, 'supplier_id', 'supp_name',array('spec_option'=>_("No Supplier Filter"),'spec_id'=>ALL_NUMERIC)); else - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + $st .= combo_input("PARAM_$index", '', $sql, 'supplier_id', 'supp_name', null); break; case 'INVOICE': $IV = _("IV"); $CN = _("CN"); if ($print_invoice_no == 1) $sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-', - ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.trans_no, if (type=10, ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName - FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=10 OR type=11) AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC"; + ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.trans_no, if (type=".ST_SALESINVOICE.", ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName + FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=".ST_SALESINVOICE." OR type=".ST_CUSTCREDIT.") AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC"; else $sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-', - ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.reference, if (type=10, ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName - FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=10 OR type=11) AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.reference, if (type=".ST_SALESINVOICE.", ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName + FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=".ST_SALESINVOICE." OR type=".ST_CUSTCREDIT.") AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC"; + $st .= combo_input("PARAM_$index", '', $sql, 'TNO', 'IName',array('order'=>false)); break; case 'DELIVERY': $DN = _("DN"); @@ -277,71 +283,76 @@ class Report concat(".TB_PREF."debtor_trans.trans_no, '-', ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.trans_no, ' $DN ', ".TB_PREF."debtors_master.name) as IName FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans - WHERE type=13 AND ".TB_PREF."debtors_master.debtor_no=". + WHERE type=".ST_CUSTDELIVERY." AND ".TB_PREF."debtors_master.debtor_no=". TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + $st .= combo_input("PARAM_$index", '', $sql, 'TNO', 'IName',array('order'=>false)); break; case 'ORDERS': $sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.order_no, '-', ".TB_PREF."debtors_master.name) as IName FROM ".TB_PREF."debtors_master, ".TB_PREF."sales_orders WHERE ".TB_PREF."debtors_master.debtor_no=".TB_PREF."sales_orders.debtor_no - AND ".TB_PREF."sales_orders.trans_type=30 ORDER BY ".TB_PREF."sales_orders.order_no DESC"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + AND ".TB_PREF."sales_orders.trans_type=".ST_SALESORDER." ORDER BY ".TB_PREF."sales_orders.order_no DESC"; + $st .= combo_input("PARAM_$index", '', $sql, 'order_no', 'IName',array('order'=>false)); break; case 'QUOTATIONS': $sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.order_no, '-', ".TB_PREF."debtors_master.name) as IName FROM ".TB_PREF."debtors_master, ".TB_PREF."sales_orders WHERE ".TB_PREF."debtors_master.debtor_no=".TB_PREF."sales_orders.debtor_no - AND ".TB_PREF."sales_orders.trans_type=32 ORDER BY ".TB_PREF."sales_orders.order_no DESC"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + AND ".TB_PREF."sales_orders.trans_type=".ST_SALESQUOTE." ORDER BY ".TB_PREF."sales_orders.order_no DESC"; + $st .= combo_input("PARAM_$index", '', $sql, 'order_no', 'IName',array('order'=>false)); break; case 'PO': $sql = "SELECT ".TB_PREF."purch_orders.order_no, concat(".TB_PREF."purch_orders.order_no, '-', ".TB_PREF."suppliers.supp_name) as IName FROM ".TB_PREF."suppliers, ".TB_PREF."purch_orders WHERE ".TB_PREF."suppliers.supplier_id=".TB_PREF."purch_orders.supplier_id ORDER BY ".TB_PREF."purch_orders.order_no DESC"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + $st .= combo_input("PARAM_$index", '', $sql, 'order_no', 'IName',array('order'=>false)); break; case 'ITEMS': - $sql = "SELECT stock_id, concat(stock_id, '-', description) as name FROM ".TB_PREF."stock_master WHERE (mb_flag='A' OR mb_flag='M') ORDER BY stock_id"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + $sql = "SELECT stock_id, concat(stock_id, '-', description) as name FROM ".TB_PREF."stock_master WHERE (mb_flag='A' OR mb_flag='M')"; + $st .= combo_input("PARAM_$index", '', $sql, 'stock_id', 'name',array('order'=>array('stock_id'))); break; case 'WORKORDER': $sql = "SELECT ".TB_PREF."workorders.id, concat(".TB_PREF."workorders.id, '-', ".TB_PREF."stock_master.description) as IName FROM ".TB_PREF."stock_master, ".TB_PREF."workorders WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."workorders.stock_id ORDER BY ".TB_PREF."workorders.id DESC"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + $st .= combo_input("PARAM_$index", '', $sql, 'id', 'IName',array('order'=>false)); break; case 'LOCATIONS': - $sql = "SELECT loc_code, location_name FROM ".TB_PREF."locations ORDER BY location_name"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Location Filter"), false); + $sql = "SELECT loc_code, location_name FROM ".TB_PREF."locations"; + $st .= combo_input("PARAM_$index", '', $sql, 'loc_code', 'location_name',array('spec_option'=>_("No Location Filter"),'spec_id'=>ALL_TEXT)); break; case 'CATEGORIES': - $sql = "SELECT category_id, description FROM ".TB_PREF."stock_category ORDER BY description"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Category Filter"), true); + $sql = "SELECT category_id, description FROM ".TB_PREF."stock_category"; + $st .= combo_input("PARAM_$index", '', $sql, 'category_id', 'description',array('spec_option'=>_("No Category Filter"),'spec_id'=>ALL_NUMERIC)); break; case 'SALESTYPES': - $sql = "SELECT id, sales_type FROM ".TB_PREF."sales_types ORDER BY sales_type"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + $sql = "SELECT id, sales_type FROM ".TB_PREF."sales_types"; + $st .= combo_input("PARAM_$index", '', $sql, 'id', 'sales_type', null); break; case 'AREAS': - $sql = "SELECT area_code, description FROM ".TB_PREF."areas ORDER BY description"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Area Filter"), true); + $sql = "SELECT area_code, description FROM ".TB_PREF."areas"; + $st .= combo_input("PARAM_$index", '', $sql, 'area_code', 'description',array('spec_option'=>_("No Area Filter"),'spec_id'=>ALL_NUMERIC)); break; case 'SALESMEN': - $sql = "SELECT salesman_code, salesman_name FROM ".TB_PREF."salesman ORDER BY salesman_name"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Sales Folk Filter"), true); + $sql = "SELECT salesman_code, salesman_name FROM ".TB_PREF."salesman"; + $st .= combo_input("PARAM_$index", '', $sql, 'salesman_code', 'salesman_name',array('spec_option'=>_("No Sales Folk Filter"),'spec_id'=>ALL_NUMERIC)); break; case 'TRANS_YEARS': - $sql = "SELECT DISTINCT YEAR(tran_date), YEAR(tran_date) FROM ".TB_PREF."gl_trans"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + $sql = "SELECT DISTINCT YEAR(tran_date) AS tran_date, YEAR(tran_date) AS tran_date2 FROM ".TB_PREF."gl_trans"; + $st .= combo_input("PARAM_$index", '', $sql, 'tran_date', 'tran_date2',array('order'=>array('tran_date'))); break; case 'USERS': - $sql = "SELECT id, user_id FROM ".TB_PREF."users ORDER BY user_id"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Users Filter"), true); + $sql = "SELECT id, user_id FROM ".TB_PREF."users"; + $st .= combo_input("PARAM_$index", '', $sql, 'id', 'user_id',array('spec_option'=>_("No Users Filter"),'spec_id'=>ALL_NUMERIC)); break; - case 'ACCOUNTS_NO_FILTER': - $sql = "SELECT id, name FROM ".TB_PREF."chart_types ORDER BY name"; - $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy); + case 'ACCOUNTTAGS': + case 'DIMENSIONTAGS': + if ($param->param_type == 'ACCOUNTTAGS') + $type = 0; + else + $type = 1; + $sql = "SELECT id, name FROM ".TB_PREF."tags WHERE type=$type"; + $st .= combo_input("PARAM_$index", '', $sql, 'id', 'name',array('spec_option'=>_("No tags"),'spec_id' => ALL_NUMERIC,'multi'=>true,'height'=>4)); break; } @@ -363,62 +374,6 @@ class ReportParam } } -function dup_simple_codeandname_list($sql, $name, &$selected_id, - $all_option=false, $all_option_name=null, $all_option_numeric=false, - $submit_on_change=false) -{ - if ($submit_on_change == true) - $st = ""; - - if ($all_option == true) - { - if ($all_option_numeric) - $reserved_word = reserved_words::get_all_numeric(); - else - $reserved_word = reserved_words::get_all(); - - if ($reserved_word == $selected_id) - { - $st .= "\n"; - } - else - { - $st .= "\n"; - } - if ($selected_id == "") - { - $selected_id = $reserved_word; - } - } - - $result = db_query($sql); - - while ($row = db_fetch_row($result)) - { - if ($selected_id == $row[0]) - { - $st .= "\n"; - - if ($selected_id == "") - { - $selected_id = $row[0]; - } - } - - $st .= ""; - db_free_result($result); - - return $st; -} - function dup_simple_name_list($name, $selections) { $st = ""; if ($all_option == true) { - $reserved_word = reserved_words::get_all_numeric(); + $reserved_word = ALL_NUMERIC; if ($reserved_word == $selected_id) $st .= "\n"; else @@ -448,9 +403,10 @@ function dup_systypes_list($name, &$selected_id, $all_option=false, $all_option_ foreach ($systypes_array as $i => $value) { - if (!$all_types && ($i == 16 || $i == 18 || $i == 25 || ($i >= 28 && $i <= 30) || $i >= 40)) + if (!$all_types && ($i == ST_LOCTRANSFER || $i == ST_PURCHORDER || $i == ST_SUPPRECEIVE || ($i >= ST_MANUISSUE && $i <= ST_SALESQUOTE) || + $i >= ST_DIMENSION)) continue; - $st .= "" . $value['name'] . "\n"; + $st .= "" . $value . "\n"; } $st .= ""; return $st;