X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_groups.php;h=889db60e9b7928af11fb66b7efdf8fb146fb416b;hb=6bcd87642330092910f5d6977845a76ac59350ac;hp=317b433ad654fcb0f193e654d6d5730e3ba29bee;hpb=06162867df8bb58fb4a614d0f912aedbbbc1f639;p=fa-stable.git

diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index 317b433a..889db60e 100644
--- a/taxes/tax_groups.php
+++ b/taxes/tax_groups.php
@@ -45,25 +45,26 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
 		// create an array of the taxes and array of rates
     	$taxes = array();
-    	$rates = array();
     	$tax_shippings = array();
 
 		while (($id = find_submit('tax_type_id'))!=-1)
 		{
-       		$taxes[] = $id;
-			$rates[] = get_tax_type_default_rate($id);
-			$tax_shippings[] = check_value('tax_shipping'.$id);
+			if (check_value('tax_type_id'.$id) != 0)
+			{
+       			$taxes[] = $id;
+				$tax_shippings[] = check_value('tax_shipping'.$id);
+			}	
 			unset($_POST['tax_type_id' . $id]);
 			unset($_POST['tax_shipping' . $id]);
 		}
     	if ($selected_id != -1) 
     	{
-	   		update_tax_group($selected_id, $_POST['name'], $taxes, $rates, $tax_shippings);
+	   		update_tax_group($selected_id, $_POST['name'], $taxes, $tax_shippings);
 			display_notification(_('Selected tax group has been updated'));
     	} 
     	else 
     	{
-	   		add_tax_group($_POST['name'], $taxes, $rates, $tax_shippings);
+	   		add_tax_group($_POST['name'], $taxes, $tax_shippings);
 			display_notification(_('New tax group has been added'));
     	}
 
@@ -176,21 +177,25 @@ table_header($th);
 while($item = db_fetch($items)) 
 {
 	start_row();
-	check_cells($item['tax_type_name'], 'tax_type_id' . $item['tax_type_id'], 
-		$selected_id!=-1 && isset($item['rate']), true, false, "align='center'");
-	/*	
-	$upd = false;	
-	if (get_post('_tax_type_id' . $item['tax_type_id'].'_update'))	
+	if ($selected_id != -1)
 	{
-		$_POST['_tax_type_id' . $item['tax_type_id'].'_update'] = 0;
-		$Ajax->activate('_page_body');
-		$upd = true;
+		check_cells($item['tax_type_name'], 'tax_type_id' . $item['tax_type_id'], 
+			isset($item['rate']), true, false, "align='center'");
+		if (isset($item['rate']))
+			check_cells(null, 'tax_shipping' . $item['tax_type_id'], $item['tax_shipping']);
 	}
-	
-	if (($selected_id!=-1 && isset($item['rate']) || $upd))
-	*/
-	if ($selected_id!=-1 && isset($item['rate']))
-		check_cells(null, 'tax_shipping' . $item['tax_type_id'], $item['tax_shipping']);
+	else
+	{
+		check_cells($item['tax_type_name'], 'tax_type_id' . $item['tax_type_id'], 
+			null, true, false, "align='center'");
+		if (get_post('_tax_type_id' . $item['tax_type_id'].'_update'))	
+		{
+			//$_POST['_tax_type_id' . $item['tax_type_id'].'_update'] = 0;
+			$Ajax->activate('_page_body');
+		}
+		if (check_value('tax_type_id' . $item['tax_type_id'])==1)
+			check_cells(null, 'tax_shipping' . $item['tax_type_id'], null);
+	}		
 	end_row();	
 	
 }
@@ -205,4 +210,3 @@ end_form();
 
 end_page();
 
-?>