X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_types.php;h=5976f1a9eda6b005c9fd1860153047181cf3a157;hb=61a25e40c92fc1d517c9c2e85ac3ec0cf05b2af3;hp=dc0277314095b818c51bfc50a39c3e2cc7e9246a;hpb=21290a4a16ca78fe736f62cf1cb039c06cb53fca;p=fa-stable.git

diff --git a/taxes/tax_types.php b/taxes/tax_types.php
index dc027731..5976f1a9 100644
--- a/taxes/tax_types.php
+++ b/taxes/tax_types.php
@@ -9,8 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 3;
-$path_to_root="..";
+$page_security = 'SA_TAXRATES';
+$path_to_root = "..";
 
 include($path_to_root . "/includes/session.inc");
 page(_("Tax Types"));
@@ -23,6 +23,8 @@ simple_page_mode(true);
 
 function can_process()
 {
+	global $selected_id;
+	
 	if (strlen($_POST['name']) == 0)
 	{
 		display_error(_("The tax type name cannot be empty."));
@@ -36,6 +38,11 @@ function can_process()
 		return false;
 	}
 
+	if (!is_tax_gl_unique(get_post('sales_gl_code', 'purchasing_gl_code', $selected_id))) {
+		display_error( _("Selected GL Accounts cannot be used by another tax type."));
+		set_focus('sales_gl_code');
+		return false;
+	}
 	return true;
 }
 
@@ -95,17 +102,22 @@ if ($Mode == 'Delete')
 if ($Mode == 'RESET')
 {
 	$selected_id = -1;
+	$sav = get_post('show_inactive');
 	unset($_POST);
+	$_POST['show_inactive'] = $sav;
 }
 //-----------------------------------------------------------------------------------
 
-$result = get_all_tax_types();
+$result = get_all_tax_types(check_value('show_inactive'));
 
 start_form();
+
+display_note(_("To avoid problems with manual journal entry all tax types should have unique Sales/Purchasing GL accounts."));
 start_table($table_style);
 
 $th = array(_("Description"), _("Default Rate (%)"),
 	_("Sales GL Account"), _("Purchasing GL Account"), "", "");
+inactive_control_column($th);
 table_header($th);
 
 $k = 0;
@@ -119,21 +131,17 @@ while ($myrow = db_fetch($result))
 	label_cell($myrow["sales_gl_code"] . "&nbsp;" . $myrow["SalesAccountName"]);
 	label_cell($myrow["purchasing_gl_code"] . "&nbsp;" . $myrow["PurchasingAccountName"]);
 
+	inactive_control_cell($myrow["id"], $myrow["inactive"], 'tax_types', 'id');
  	edit_button_cell("Edit".$myrow["id"], _("Edit"));
  	delete_button_cell("Delete".$myrow["id"], _("Delete"));
 
 	end_row();
 }
 
-end_table();
-
-end_form();
-echo '<br>';
-
+inactive_control_row($th);
+end_table(1);
 //-----------------------------------------------------------------------------------
 
-start_form();
-
 start_table($table_style2);
 
 if ($selected_id != -1)