X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_groups.php;h=16873e04ecf2724e849795ea1a2ef1a522827365;hb=efa2530a7c385a329c3fc76f4560b28ba97c3efe;hp=a210ad965747eea460b16da09d2cbc22dc481a69;hpb=d9b4de9d7e9d3ba77f6ece752fd6cc988effd8f1;p=fa-stable.git

diff --git a/taxes/tax_groups.php b/taxes/tax_groups.php
index a210ad96..16873e04 100644
--- a/taxes/tax_groups.php
+++ b/taxes/tax_groups.php
@@ -40,52 +40,31 @@ 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
-    	for ($i = 0; $i < 5; $i++) 
-    	{
-    		if (isset($_POST['tax_type_id' . $i]) && 
-    			$_POST['tax_type_id' . $i] != ALL_NUMERIC	&& 
-    			!check_num('rate' . $i, 0))
-    		{
-			display_error( _("An entered tax rate is invalid or less than zero."));
-    			$input_error = 1;
-			set_focus('rate');
-			break;
-    		}
-    	}
-	}
-	*/
 	if ($input_error != 1) 
 	{
 
 		// create an array of the taxes and array of rates
     	$taxes = array();
-    	$rates = array();
-
-    	for ($i = 0; $i < 5; $i++) 
-    	{
-    		if (isset($_POST['tax_type_id' . $i]) &&
-   				$_POST['tax_type_id' . $i] != ANY_NUMERIC) 
-   			{
-        		$taxes[] = $_POST['tax_type_id' . $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);
-    		}
-    	}
-
+    	$tax_shippings = array();
+
+		while (($id = find_submit('tax_type_id'))!=-1)
+		{
+			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'], $_POST['tax_shipping'], $taxes, 
-    			$rates);
+	   		update_tax_group($selected_id, $_POST['name'], $taxes, $tax_shippings);
 			display_notification(_('Selected tax group has been updated'));
     	} 
     	else 
     	{
-	   		add_tax_group($_POST['name'], $_POST['tax_shipping'], $taxes, $rates);
+	   		add_tax_group($_POST['name'], $taxes, $tax_shippings);
 			display_notification(_('New tax group has been added'));
     	}
 
@@ -134,16 +113,19 @@ if ($Mode == 'RESET')
 	$selected_id = -1;
 	$sav = get_post('show_inactive');
 	unset($_POST);
-	$_POST['show_inactive'] = $sav;
+	if ($sav)
+		$_POST['show_inactive'] = $sav;
 }
 //-----------------------------------------------------------------------------------
 
 $result = get_all_tax_groups(check_value('show_inactive'));
 
 start_form();
+
 start_table(TABLESTYLE);
-$th = array(_("Description"), _("Tax Shipping"), "", "");
+$th = array(_("Description"), "", "");
 inactive_control_column($th);
+
 table_header($th);
 
 $k = 0;
@@ -153,19 +135,11 @@ while ($myrow = db_fetch($result))
 	alt_table_row_color($k);
 
 	label_cell($myrow["name"]);
-	if ($myrow["tax_shipping"])
-		label_cell(_("Yes"));
-	else
-		label_cell(_("No"));
-
-	/*for ($i=0; $i< 5; $i++)
-		if ($myrow["type" . $i] != ALL_NUMERIC)
-			echo "<td>" . $myrow["type" . $i] . "</td>";*/
 
 	inactive_control_cell($myrow["id"], $myrow["inactive"], 'tax_groups', 'id');
  	edit_button_cell("Edit".$myrow["id"], _("Edit"));
  	delete_button_cell("Delete".$myrow["id"], _("Delete"));
-	end_row();;
+	end_row();
 }
 
 inactive_control_row($th);
@@ -183,53 +157,47 @@ if ($selected_id != -1)
     	$group = get_tax_group($selected_id);
 
     	$_POST['name']  = $group["name"];
-    	$_POST['tax_shipping'] = $group["tax_shipping"];
 
-    	$items = get_tax_group_items($selected_id);
-
-    	$i = 0;
-    	while ($tax_item = db_fetch($items)) 
-    	{
-    		$_POST['tax_type_id' . $i]  = $tax_item["tax_type_id"];
-    		$_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);
 
 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);
+
+$items = get_tax_group_rates($selected_id!=-1 ? $selected_id : null);
 
 start_table(TABLESTYLE2);
-//$th = array(_("Tax"), _("Default Rate (%)"), _("Rate (%)"));
-//Editable rate has been removed 090920 Joe Hunt
-$th = array(_("Tax"), _("Rate (%)"));
+$th = array(_("Tax"), "", _("Shipping Tax"));
 table_header($th);
-for ($i = 0; $i < 5; $i++) 
+
+while($item = db_fetch($items)) 
 {
 	start_row();
-	if (!isset($_POST['tax_type_id' . $i]))
-		$_POST['tax_type_id' . $i] = 0;
-	tax_types_list_cells(null, 'tax_type_id' . $i, $_POST['tax_type_id' . $i], _("None"), true);
-
-	if ($_POST['tax_type_id' . $i] != 0 && $_POST['tax_type_id' . $i] != ALL_NUMERIC) 
+	if ($selected_id != -1)
 	{
-		$default_rate = get_tax_type_default_rate($_POST['tax_type_id' . $i]);
-		label_cell(percent_format($default_rate), "nowrap align=right");
-
-		//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()); 
+		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']);
 	}
-	end_row();
+	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();	
+	
 }
 
 end_table(1);
@@ -242,4 +210,3 @@ end_form();
 
 end_page();
 
-?>