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

diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index e3393912..e7f99f21 100644
--- a/taxes/tax_groups.php
+++ b/taxes/tax_groups.php
@@ -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,11 +70,7 @@ 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);
     		}
     	}
 
@@ -81,13 +78,13 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
     	{
 
     		update_tax_group($selected_id, $_POST['name'], $_POST['tax_shipping'], $taxes, 
-    			$rates, $included);
+    			$rates);
 
     	} 
     	else 
     	{
 
-    		add_tax_group($_POST['name'], $_POST['tax_shipping'], $taxes, $rates, $included);
+    		add_tax_group($_POST['name'], $_POST['tax_shipping'], $taxes, $rates);
     	}
 
 		meta_forward($_SERVER['PHP_SELF']);
@@ -191,8 +188,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,27 +203,25 @@ 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();
 }