Eliminated non-static method calls and other bulk fixes to fix php5 warnings

[fa-stable.git] / taxes / tax_groups.php

diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index 335691e1e720443ca31461827ae36827ddb4fec5..7a5aabd1d04c5ab4f1ade112d5643f3e589cb7b1 100644 (file)
--- a/taxes/tax_groups.php
+++ b/taxes/tax_groups.php
@@ -1,7 +1,16 @@
 <?php
-
-$page_security = 3;
-$path_to_root="..";
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_TAXGROUPS';
+$path_to_root = "..";
 
 include($path_to_root . "/includes/session.inc");
 
@@ -37,7 +46,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
        for ($i = 0; $i < 5; $i++) 
        {
                if (isset($_POST['tax_type_id' . $i]) && 
-                       $_POST['tax_type_id' . $i] != reserved_words::get_all_numeric() && 
+                       $_POST['tax_type_id' . $i] != ALL_NUMERIC       && 
                        !check_num('rate' . $i, 0))
                {
                        display_error( _("An entered tax rate is invalid or less than zero."));
@@ -58,7 +67,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
        for ($i = 0; $i < 5; $i++) 
        {
                if (isset($_POST['tax_type_id' . $i]) &&
-                               $_POST['tax_type_id' . $i] != reserved_words::get_any_numeric()) 
+                               $_POST['tax_type_id' . $i] != ANY_NUMERIC) 
                        {
                        $taxes[] = $_POST['tax_type_id' . $i];
                        $rates[] = input_num('rate' . $i);
@@ -126,15 +135,18 @@ if ($Mode == 'Delete')
 if ($Mode == 'RESET')
 {
        $selected_id = -1;
+       $sav = get_post('show_inactive');
        unset($_POST);
+       $_POST['show_inactive'] = $sav;
 }
 //-----------------------------------------------------------------------------------
 
-$result = get_all_tax_groups();
+$result = get_all_tax_groups(check_value('show_inactive'));
 
 start_form();
 start_table($table_style);
 $th = array(_("Description"), _("Tax Shipping"), "", "");
+inactive_control_column($th);
 table_header($th);
 
 $k = 0;
@@ -150,22 +162,19 @@ while ($myrow = db_fetch($result))
                label_cell(_("No"));
 
        /*for ($i=0; $i< 5; $i++)
-               if ($myrow["type" . $i] != reserved_words::get_all_numeric())
+               if ($myrow["type" . $i] != ALL_NUMERIC)
                        echo "<td>" . $myrow["type" . $i] . "</td>";*/
 
+       inactive_control_cell($myrow["id"], $myrow["inactive"], 'tax_groups', 'id');
        edit_button_cell("Edit".$myrow["id"], _("Edit"));
-       edit_button_cell("Delete".$myrow["id"], _("Delete"));
+       delete_button_cell("Delete".$myrow["id"], _("Delete"));
        end_row();;
 }
 
-end_table();
-end_form();
-echo '<br>';
-
+inactive_control_row($th);
+end_table(1);
 //-----------------------------------------------------------------------------------
 
-start_form();
-
 start_table($table_style2);
 
 if ($selected_id != -1) 
@@ -208,7 +217,7 @@ for ($i = 0; $i < 5; $i++)
                $_POST['tax_type_id' . $i] = 0;
        tax_types_list_cells(null, 'tax_type_id' . $i, $_POST['tax_type_id' . $i], _("None"), true);
 
-       if ($_POST['tax_type_id' . $i] != 0 && $_POST['tax_type_id' . $i] != reserved_words::get_all_numeric()) 
+       if ($_POST['tax_type_id' . $i] != 0 && $_POST['tax_type_id' . $i] != ALL_NUMERIC) 
        {
 
                $default_rate = get_tax_type_default_rate($_POST['tax_type_id' . $i]);
@@ -224,7 +233,7 @@ for ($i = 0; $i < 5; $i++)
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();