Merged changes from main CVS up to 2.1.5

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

diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index 398d6255f485aff7b1e32db5cd13c8435585e4d4..b28f4fa998d80aca526c70e0098ce43eaf7efd4d 100644 (file)
--- a/taxes/tax_groups.php
+++ b/taxes/tax_groups.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    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 = 3;
 $path_to_root="..";
 
@@ -13,22 +22,13 @@ include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/taxes/db/tax_groups_db.inc");
 include_once($path_to_root . "/taxes/db/tax_types_db.inc");
 
-if (isset($_GET['selected_id']))
-{
-       $selected_id = $_GET['selected_id'];
-} 
-elseif(isset($_POST['selected_id']))
-{
-       $selected_id = $_POST['selected_id'];
-}
-else
-       $selected_id = -1;
+simple_page_mode(true);
        
 check_db_has_tax_types(_("There are no tax types defined. Define tax types before defining tax groups."));
 
 //-----------------------------------------------------------------------------------
 
-if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM'])) 
+if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') 
 {
 
        //initialise no input errors assumed initially before we test
@@ -76,18 +76,17 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
 
        if ($selected_id != -1) 
        {
-
-               update_tax_group($selected_id, $_POST['name'], $_POST['tax_shipping'], $taxes, 
+                       update_tax_group($selected_id, $_POST['name'], $_POST['tax_shipping'], $taxes, 
                        $rates);
-
+                       display_notification(_('Selected tax group has been updated'));
        } 
        else 
        {
-
-               add_tax_group($_POST['name'], $_POST['tax_shipping'], $taxes, $rates);
+                       add_tax_group($_POST['name'], $_POST['tax_shipping'], $taxes, $rates);
+                       display_notification(_('New tax group has been added'));
        }
 
-               meta_forward($_SERVER['PHP_SELF']);
+               $Mode = 'RESET';
        }
 }
 
@@ -122,22 +121,32 @@ function can_delete($selected_id)
 
 //-----------------------------------------------------------------------------------
 
-if (isset($_GET['delete'])) 
+if ($Mode == 'Delete')
 {
 
        if (can_delete($selected_id))
        {
                delete_tax_group($selected_id);
-               meta_forward($_SERVER['PHP_SELF']);
+               display_notification(_('Selected tax group has been deleted'));
        }
+       $Mode = 'RESET';
 }
 
+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;
@@ -156,27 +165,23 @@ while ($myrow = db_fetch($result))
                if ($myrow["type" . $i] != reserved_words::get_all_numeric())
                        echo "<td>" . $myrow["type" . $i] . "</td>";*/
 
-       edit_link_cell("selected_id=" . $myrow["id"]);
-       delete_link_cell("selected_id=" . $myrow["id"]. "&delete=1");
+       inactive_control_cell($myrow["id"], $myrow["inactive"], 'tax_groups', 'id');
+       edit_button_cell("Edit".$myrow["id"], _("Edit"));
+       delete_button_cell("Delete".$myrow["id"], _("Delete"));
        end_row();;
 }
 
-end_table();
-
+inactive_control_row($th);
+end_table(1);
 //-----------------------------------------------------------------------------------
 
-hyperlink_no_params($_SERVER['PHP_SELF'], _("New Tax Group"));
-
-start_form();
-
 start_table($table_style2);
 
 if ($selected_id != -1) 
 {
        //editing an existing status code
 
-       if (!isset($_POST['name']))
-       {
+       if ($Mode == 'Edit') {
        $group = get_tax_group($selected_id);
 
        $_POST['name']  = $group["name"];
@@ -210,7 +215,7 @@ for ($i = 0; $i < 5; $i++)
        start_row();
        if (!isset($_POST['tax_type_id' . $i]))
                $_POST['tax_type_id' . $i] = 0;
-       tax_types_list_cells(null, 'tax_type_id' . $i, $_POST['tax_type_id' . $i], true, _("None"), true);
+       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()) 
        {
@@ -228,7 +233,7 @@ for ($i = 0; $i < 5; $i++)
 
 end_table(1);
 
-submit_add_or_update_center(!isset($selected_id));
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();