New files from unstable branch

[fa-stable.git] / taxes / item_tax_types.php

diff --git a/taxes/item_tax_types.php b/taxes/item_tax_types.php
index 43fa12145183a2150eb01e854fc61e75f708c0a1..4f93fa59076df1e7e99f4f79d470f8a76a0438c3 100644 (file)
--- a/taxes/item_tax_types.php
+++ b/taxes/item_tax_types.php
@@ -72,10 +72,7 @@ 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;
@@ -111,7 +108,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,7 +140,7 @@ inactive_control_row($th);
 end_table(1);
 //-----------------------------------------------------------------------------------
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1) 
 {
@@ -179,7 +176,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);