Fixed GET continuation after timeot and logout page access without authorization.

[fa-stable.git] / reporting / includes / reports_classes.inc

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 803160fe8b740ec7d7afc8032c34eb2fd7475ea8..b4ffa5c323e1a9982274babeb0820f7455ea9e55 100644 (file)
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -197,7 +197,8 @@ class Report
                                        $st .= dup_simple_name_list("PARAM_$index", $sel);
                                        break;
                                case 'SYS_TYPES':
-                                       $st .= dup_systypes_list("PARAM_$index", $dummy, true, _("No Type Filter"), true);
+                               case 'SYS_TYPES_ALL':
+                                       $st .= dup_systypes_list("PARAM_$index", $dummy, true, _("No Type Filter"), ($param->param_type=='SYS_TYPES_ALL'));
                                        break;
                                case 'TEXT':
                                        $st .= "<input type='text' name='PARAM_$index'>";
@@ -262,12 +263,12 @@ class Report
                                        $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";
+                                                       ".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 .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
                                        break;
                                case 'DELIVERY':
@@ -276,14 +277,22 @@ 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);
                                        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 ORDER BY ".TB_PREF."sales_orders.order_no DESC";
+                                               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=".ST_SALESORDER." ORDER BY ".TB_PREF."sales_orders.order_no DESC";
+                                       $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
+                                       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=".ST_SALESQUOTE." ORDER BY ".TB_PREF."sales_orders.order_no DESC";
                                        $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
                                        break;
                                case 'PO':
@@ -296,6 +305,12 @@ class Report
                                        $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);
                                        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);
+                                       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);
@@ -320,6 +335,10 @@ class Report
                                        $sql = "SELECT DISTINCT YEAR(tran_date), YEAR(tran_date) FROM ".TB_PREF."gl_trans";
                                        $st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
                                        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);
+                                       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);
@@ -356,9 +375,9 @@ function dup_simple_codeandname_list($sql, $name, &$selected_id,
        if ($all_option == true)
        {
                if ($all_option_numeric)
-                       $reserved_word = reserved_words::get_all_numeric();
+                       $reserved_word = ALL_NUMERIC;
                else
-                       $reserved_word = reserved_words::get_all();
+                       $reserved_word = ALL_TEXT;
 
        if ($reserved_word == $selected_id)
        {
@@ -411,14 +430,14 @@ function dup_simple_name_list($name, $selections)
 
 //------------------------------------------------------------------------------------------------
 
-function dup_systypes_list($name, &$selected_id, $all_option=false, $all_option_name=null)
+function dup_systypes_list($name, &$selected_id, $all_option=false, $all_option_name=null, $all_types=false)
 {
        global $systypes_array;
 
        $st = "<select name='$name'>";
        if ($all_option == true)
        {
-               $reserved_word = reserved_words::get_all_numeric();
+               $reserved_word = ALL_NUMERIC;
        if ($reserved_word == $selected_id)
             $st .= "<option selected value='" . $reserved_word . "'>" . $all_option_name . "</option>\n";
        else
@@ -429,9 +448,10 @@ function dup_systypes_list($name, &$selected_id, $all_option=false, $all_option_
 
        foreach ($systypes_array as $i => $value)
        {
-               if ($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 .= "<option" . ($selected_id == $i ? " selected" : "") . " value='$i'>" . $value['name'] . "</option>\n";
+       $st .= "<option" . ($selected_id == $i ? " selected" : "") . " value='$i'>" . $value . "</option>\n";
        }
     $st .= "</select>";
        return $st;