X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_groups.php;h=b28f4fa998d80aca526c70e0098ce43eaf7efd4d;hb=4a66afcbed7fb883d00c1a6a807497ccfd181378;hp=78993f2a6786e3fd9a450f7ee0733014734e6b33;hpb=8259c324f645a39cb847d5a4346b70e225e1b02c;p=fa-stable.git

diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index 78993f2a..b28f4fa9 100644
--- 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="..";
 
@@ -119,22 +128,25 @@ if ($Mode == 'Delete')
 	{
 		delete_tax_group($selected_id);
 		display_notification(_('Selected tax group has been deleted'));
-		$Mode = 'RESET';
 	}
+	$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;
@@ -153,19 +165,16 @@ while ($myrow = db_fetch($result))
 		if ($myrow["type" . $i] != reserved_words::get_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) 
@@ -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();