X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Fitem_tax_types.php;h=661c86ca6d2709733c35ff8fefad987636fd0146;hb=b9656a694227d0d22242fffbb343691b0db82030;hp=f274556d984ab39742d0759f1f17ab8d33591286;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/taxes/item_tax_types.php b/taxes/item_tax_types.php
index f274556d..661c86ca 100644
--- a/taxes/item_tax_types.php
+++ b/taxes/item_tax_types.php
@@ -32,6 +32,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
 	{
 		$input_error = 1;
 		display_error(_("The item tax type description cannot be empty."));
+		set_focus('name');
 	}
 
 	if ($input_error != 1) 
@@ -97,14 +98,15 @@ if (isset($_GET['delete']))
 
 //-----------------------------------------------------------------------------------
 
-$result = get_all_item_tax_types();
 
+$result2 = $result = get_all_item_tax_types();
 start_table("$table_style width=30%");
-$th = array(_("Name"), _("Tax exempt"), "", "");
+$th = array(_("Name"), _("Tax exempt"),'','');
+
 table_header($th);
 
 $k = 0;
-while ($myrow = db_fetch($result)) 
+while ($myrow = db_fetch($result2)) 
 {
 	
 	alt_table_row_color($k);	
@@ -172,7 +174,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);
-    $th = array(_("Tax Name"), _("Is exempt"));
+    $th = array(_("Tax Name"), _("Rate"), _("Is exempt"));
     table_header($th);
     	
     $tax_types = get_all_tax_types_simple();    	
@@ -183,6 +185,7 @@ if (!isset($_POST['exempt']) || $_POST['exempt'] == 0)
     	alt_table_row_color($k);	
     
     	label_cell($myrow["name"]);
+	label_cell(percent_format($myrow["rate"])." %", "nowrap align=right");
     	check_cells("", 'ExemptTax' . $myrow["id"], null);
     	end_row();
     }