X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_groups.php;h=bf888159043376a45cfdcb14c72bec0f5d09707f;hb=70c2dbcf463a5d500d15b8510c7f45e527a7fa53;hp=7a5aabd1d04c5ab4f1ade112d5643f3e589cb7b1;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index 7a5aabd1..bf888159 100644
--- a/taxes/tax_groups.php
+++ b/taxes/tax_groups.php
@@ -14,7 +14,7 @@ $path_to_root = "..";
 
 include($path_to_root . "/includes/session.inc");
 
-page(_("Tax Groups"));
+page(_($help_context = "Tax Groups"));
 
 include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/includes/ui.inc");
@@ -40,6 +40,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='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
@@ -56,7 +57,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
     		}
     	}
 	}
-
+	*/
 	if ($input_error != 1) 
 	{
 
@@ -70,7 +71,9 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
    				$_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);
     		}
     	}
 
@@ -96,21 +99,15 @@ 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";
-	$result = db_query($sql, "could not query customers");
-	$myrow = db_fetch_row($result);
-	if ($myrow[0] > 0) 
+	if (key_in_foreign_table($selected_id, 'cust_branch', 'tax_group_id'))	
 	{
-		display_note(_("Cannot delete this tax group because customer branches been created referring to it."));
+		display_error(_("Cannot delete this tax group because customer branches been created referring to it."));
 		return false;
 	}
 
-	$sql = "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE tax_group_id=$selected_id";
-	$result = db_query($sql, "could not query suppliers");
-	$myrow = db_fetch_row($result);
-	if ($myrow[0] > 0) 
+	if (key_in_foreign_table($selected_id, 'suppliers', 'tax_group_id'))
 	{
-		display_note(_("Cannot delete this tax group because suppliers been created referring to it."));
+		display_error(_("Cannot delete this tax group because suppliers been created referring to it."));
 		return false;
 	}
 
@@ -144,9 +141,11 @@ if ($Mode == 'RESET')
 $result = get_all_tax_groups(check_value('show_inactive'));
 
 start_form();
-start_table($table_style);
-$th = array(_("Description"), _("Tax Shipping"), "", "");
+
+start_table(TABLESTYLE);
+$th = array(_("Description"), _("Shipping Tax"), "", "");
 inactive_control_column($th);
+
 table_header($th);
 
 $k = 0;
@@ -173,9 +172,10 @@ while ($myrow = db_fetch($result))
 
 inactive_control_row($th);
 end_table(1);
+
 //-----------------------------------------------------------------------------------
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1) 
 {
@@ -196,19 +196,22 @@ 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);
 }
 text_row_ex(_("Description:"), 'name', 40);
-yesno_list_row(_("Tax Shipping:"), 'tax_shipping', null, "", "", true);
+yesno_list_row(_("Tax applied to Shipping:"), 'tax_shipping', null, "", "", true);
 
 end_table();
 
-display_note(_("Select the taxes that are included in this group."), 1);
+display_note(_("Select the taxes that are included in this group."), 1, 1);
 
-start_table($table_style2);
-$th = array(_("Tax"), _("Default Rate (%)"), _("Rate (%)"));
+start_table(TABLESTYLE2);
+//$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++) 
 {
@@ -219,14 +222,14 @@ for ($i = 0; $i < 5; $i++)
 
 	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();
 }