X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_groups.php;h=c633c556de77bd6be2b1bc9ae666803bce03fb39;hb=11e485e4a7c5f12c9424713b7330815a9cc5e4ae;hp=e3393912e3bc81750b629704d11047d2a97f8d56;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index e3393912..c633c556 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
@@ -38,6 +38,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
 	{
 		$input_error = 1;
 		display_error(_("The tax group name cannot be empty."));
+		set_focus('name');
 	} 
 	else 
 	{
@@ -46,11 +47,12 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
     	{
     		if (isset($_POST['tax_type_id' . $i]) && 
     			$_POST['tax_type_id' . $i] != reserved_words::get_all_numeric()	&& 
-    			(!is_numeric($_POST['rate' . $i]) || $_POST['rate' . $i] < 0))
+    			!check_num('rate' . $i, 0))
     		{
-				display_error( _("An entered tax rate is invalid or less than zero."));
+			display_error( _("An entered tax rate is invalid or less than zero."));
     			$input_error = 1;
-				break;
+			set_focus('rate');
+			break;
     		}
     	}
 	}
@@ -61,7 +63,6 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
 		// create an array of the taxes and array of rates
     	$taxes = array();
     	$rates = array();
-    	$included = array();
 
     	for ($i = 0; $i < 5; $i++) 
     	{
@@ -69,28 +70,23 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
    				$_POST['tax_type_id' . $i] != reserved_words::get_any_numeric()) 
    			{
         		$taxes[] = $_POST['tax_type_id' . $i];
-        		$rates[] = $_POST['rate' . $i];
-        		if (isset($_POST['included' . $i]))
-        			$included[] = 1;
-        		else	
-        			$included[] = 0;
+        		$rates[] = input_num('rate' . $i);
     		}
     	}
 
     	if ($selected_id != -1) 
     	{
-
-    		update_tax_group($selected_id, $_POST['name'], $_POST['tax_shipping'], $taxes, 
-    			$rates, $included);
-
+	   		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, $included);
+	   		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';
 	}
 }
 
@@ -125,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;
@@ -159,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"];
@@ -191,8 +193,7 @@ if ($selected_id != -1)
     	while ($tax_item = db_fetch($items)) 
     	{
     		$_POST['tax_type_id' . $i]  = $tax_item["tax_type_id"];
-    		$_POST['rate' . $i]  = $tax_item["rate"];
-    		$_POST['included' . $i]  = $tax_item["included_in_price"];
+    		$_POST['rate' . $i]  = percent_format($tax_item["rate"]);
     		$i ++;
     	}
 	}
@@ -207,34 +208,32 @@ end_table();
 display_note(_("Select the taxes that are included in this group."), 1);
 
 start_table($table_style2);
-$th = array(_("Tax"), _("Default Rate (%)"), _("Rate (%)"), _("Include in Price"));
+$th = array(_("Tax"), _("Default Rate (%)"), _("Rate (%)"));
 table_header($th);
 for ($i = 0; $i < 5; $i++) 
 {
 	start_row();
 	if (!isset($_POST['tax_type_id' . $i]))
 		$_POST['tax_type_id' . $i] = 0;
-	if (!isset($_POST['included' . $i]))
-		$_POST['included' . $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()) 
 	{
 
 		$default_rate = get_tax_type_default_rate($_POST['tax_type_id' . $i]);
-		label_cell(number_format2($default_rate, user_percent_dec()), "nowrap align=right");
+		label_cell(percent_format($default_rate), "nowrap align=right");
 
 		if (!isset($_POST['rate' . $i]) || $_POST['rate' . $i] == "")
-			$_POST['rate' . $i] = $default_rate;
-		text_cells(null, 'rate' . $i, $_POST['rate' . $i], 10, 10);
-		check_cells(null, 'included' . $i, $_POST['included' . $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();