X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=taxes%2Ftax_types.php;h=c826ae4847dcc6e97b1a70e3760ea26e85c41b78;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hp=e7aa9240114516f8099f01ce0e63cdac5d215993;hpb=e29ab37ef51f39c200c3772e07eeceef0ce39214;p=fa-stable.git

diff --git a/taxes/tax_types.php b/taxes/tax_types.php
index e7aa9240..c826ae48 100644
--- a/taxes/tax_types.php
+++ b/taxes/tax_types.php
@@ -9,11 +9,11 @@
     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"));
+page(_($help_context = "Tax Types"));
 
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/taxes/db/tax_types_db.inc");
@@ -38,7 +38,7 @@ function can_process()
 		return false;
 	}
 
-	if (!is_tax_gl_unique(get_post('sales_gl_code', 'purchasing_gl_code', $selected_id))) {
+	if (!is_tax_gl_unique(get_post('sales_gl_code'), get_post('purchasing_gl_code'), $selected_id)) {
 		display_error( _("Selected GL Accounts cannot be used by another tax type."));
 		set_focus('sales_gl_code');
 		return false;
@@ -72,10 +72,7 @@ if ($Mode=='UPDATE_ITEM' && can_process())
 
 function can_delete($selected_id)
 {
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_group_items	WHERE tax_type_id=".db_escape($selected_id);
-	$result = db_query($sql, "could not query tax groups");
-	$myrow = db_fetch_row($result);
-	if ($myrow[0] > 0)
+	if (key_in_foreign_table($selected_id, 'tax_group_items', 'tax_type_id'))
 	{
 		display_error(_("Cannot delete this tax type because tax groups been created referring to it."));
 
@@ -102,19 +99,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);
+display_note(_("To avoid problems with manual journal entry all tax types should have unique Sales/Purchasing GL accounts."), 0, 1);
+start_table(TABLESTYLE);
 
 $th = array(_("Description"), _("Default Rate (%)"),
 	_("Sales GL Account"), _("Purchasing GL Account"), "", "");
+inactive_control_column($th);
 table_header($th);
 
 $k = 0;
@@ -128,22 +128,18 @@ 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);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1) 
 {
@@ -167,10 +163,9 @@ gl_all_accounts_list_row(_("Purchasing GL Account:"), 'purchasing_gl_code', null
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();
 
 end_page();
 
-?>