X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_groups.php;h=ea61fd3444f0fb71ecd96d8a6952fb30d6579d74;hb=12aba8d6c76b53b221b3bcf9eeffe3ab40f3e767;hp=e7f99f21e86b3b213ec66d7a9535caca1d6a6375;hpb=d67d5295b9342c011697ce4df325197e29898588;p=fa-stable.git

diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index e7f99f21..ea61fd34 100644
--- 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");
 
@@ -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
@@ -40,13 +40,14 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
 		display_error(_("The tax group name cannot be empty."));
 		set_focus('name');
 	} 
+	/* Editable rate has been removed 090920 Joe Hunt
 	else 
 	{
 		// make sure any entered rates are valid
     	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."));
@@ -56,7 +57,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
     		}
     	}
 	}
-
+	*/
 	if ($input_error != 1) 
 	{
 
@@ -67,27 +68,28 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['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);
+				$rates[] = get_tax_type_default_rate($_POST['tax_type_id' . $i]);
+				//Editable rate has been removed 090920 Joe Hunt
+        		//$rates[] = input_num('rate' . $i);
     		}
     	}
 
     	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';
 	}
 }
 
@@ -97,7 +99,7 @@ function can_delete($selected_id)
 {
 	if ($selected_id == -1)
 		return false;
-	$sql = "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE tax_group_id=$selected_id";
+	$sql = "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE tax_group_id=".db_escape($selected_id);
 	$result = db_query($sql, "could not query customers");
 	$myrow = db_fetch_row($result);
 	if ($myrow[0] > 0) 
@@ -106,7 +108,7 @@ function can_delete($selected_id)
 		return false;
 	}
 
-	$sql = "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE tax_group_id=$selected_id";
+	$sql = "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE tax_group_id=".db_escape($selected_id);
 	$result = db_query($sql, "could not query suppliers");
 	$myrow = db_fetch_row($result);
 	if ($myrow[0] > 0) 
@@ -122,22 +124,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;
@@ -153,30 +165,27 @@ 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>";*/
 
-	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"];
@@ -191,6 +200,7 @@ if ($selected_id != -1)
     		$_POST['rate' . $i]  = percent_format($tax_item["rate"]);
     		$i ++;
     	}
+    	while($i<5) unset($_POST['tax_type_id'.$i++]);
 	}
 
 	hidden('selected_id', $selected_id);
@@ -203,7 +213,9 @@ end_table();
 display_note(_("Select the taxes that are included in this group."), 1);
 
 start_table($table_style2);
-$th = array(_("Tax"), _("Default Rate (%)"), _("Rate (%)"));
+//$th = array(_("Tax"), _("Default Rate (%)"), _("Rate (%)"));
+//Editable rate has been removed 090920 Joe Hunt
+$th = array(_("Tax"), _("Rate (%)"));
 table_header($th);
 for ($i = 0; $i < 5; $i++) 
 {
@@ -212,23 +224,23 @@ 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]);
 		label_cell(percent_format($default_rate), "nowrap align=right");
 
-		if (!isset($_POST['rate' . $i]) || $_POST['rate' . $i] == "")
-			$_POST['rate' . $i] = percent_format($default_rate);
-		small_amount_cells(null, 'rate' . $i, $_POST['rate' . $i], null, null, 
-		  user_percent_dec());
+		//Editable rate has been removed 090920 Joe Hunt
+		//if (!isset($_POST['rate' . $i]) || $_POST['rate' . $i] == "")
+		//	$_POST['rate' . $i] = percent_format($default_rate);
+		//small_amount_cells(null, 'rate' . $i, $_POST['rate' . $i], null, null, 
+		//  user_percent_dec()); 
 	}
 	end_row();
 }
 
 end_table(1);
 
-submit_add_or_update_center(!isset($selected_id));
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();