X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Fitem_tax_types.php;h=5f2d0e06a6d6304a4211c4d45b1ecb3aae747753;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=f1414efcfe084145479ad4ac5c8ef2c80224bb7f;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git

diff --git a/taxes/item_tax_types.php b/taxes/item_tax_types.php
index f1414efc..5f2d0e06 100644
--- a/taxes/item_tax_types.php
+++ b/taxes/item_tax_types.php
@@ -72,14 +72,16 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
 function can_delete($selected_id)
 {
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE tax_type_id=".db_escape($selected_id);
-	$result = db_query($sql, "could not query stock master");
-	$myrow = db_fetch_row($result);
-	if ($myrow[0] > 0) 
+	if (key_in_foreign_table($selected_id, 'stock_master', 'tax_type_id'))
 	{
 		display_error(_("Cannot delete this item tax type because items have been created referring to it."));
 		return false;
 	}
+	if (key_in_foreign_table($selected_id, 'stock_category', 'dflt_tax_type'))
+	{
+		display_error(_("Cannot delete this item tax type because item categories have been created referring to it."));
+		return false;
+	}
 	
 	return true;
 }
@@ -111,7 +113,7 @@ if ($Mode == 'RESET')
 $result2 = $result = get_all_item_tax_types(check_value('show_inactive'));
 
 start_form();
-start_table("$table_style width=30%");
+start_table(TABLESTYLE, "width='30%'");
 $th = array(_("Name"), _("Tax exempt"),'','');
 inactive_control_column($th);
 table_header($th);
@@ -143,13 +145,13 @@ inactive_control_row($th);
 end_table(1);
 //-----------------------------------------------------------------------------------
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1) 
 {
 	if ($Mode == 'Edit') {
    		$myrow = get_item_tax_type($selected_id);
-    
+   		unset($_POST); // clear exemption checkboxes
    		$_POST['name']  = $myrow["name"];
    		$_POST['exempt']  = $myrow["exempt"];
     	
@@ -179,7 +181,7 @@ if (!isset($_POST['exempt']) || $_POST['exempt'] == 0)
 
     display_note(_("Select which taxes this item tax type is exempt from."), 0, 1);
     
-    start_table($table_style2);
+    start_table(TABLESTYLE2);
     $th = array(_("Tax Name"), _("Rate"), _("Is exempt"));
     table_header($th);
     	
@@ -207,4 +209,3 @@ end_form();
 
 end_page();
 
-?>