X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_account_types.php;h=ac3b32cfd720288d5e7b6df568b16bc13d56f7d2;hb=fbdfe3f3da62ecf86e3ad978b89efbb6c317a47a;hp=4e2ce39ffed85b7616aaeca0dacfe04224cdee5a;hpb=e82fa1f01d7f0d7706b9d3e2efaa9a31cc0777f6;p=fa-stable.git

diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php
index 4e2ce39f..ac3b32cf 100644
--- a/gl/manage/gl_account_types.php
+++ b/gl/manage/gl_account_types.php
@@ -1,22 +1,37 @@
 <?php
-
-$page_security = 3;
-$path_to_root="../..";
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_GLACCOUNTGROUP';
+$path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
 
-page(_("GL Account Groups"));
+page(_($help_context = "GL Account Groups"));
 
 include($path_to_root . "/gl/includes/gl_db.inc");
 
 include($path_to_root . "/includes/ui.inc");
 
-simple_page_mode(false);
+simple_page_mode(true);
 //-----------------------------------------------------------------------------------
 
 function can_process() 
 {
 	global $selected_id;
 
+	if (!input_num('id'))
+	{
+	    display_error( _("The account id must be an integer and cannot be empty."));
+	    set_focus('id');
+	    return false;
+	}
 	if (strlen($_POST['name']) == 0) 
 	{
 		display_error( _("The account group name cannot be empty."));
@@ -41,17 +56,18 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 	if (can_process()) 
 	{
 
-    	if ($selected_id != "") 
+    	if ($selected_id != -1) 
     	{
-    		update_account_type($selected_id, $_POST['name'], $_POST['class_id'], $_POST['parent']);
-			display_notification(_('Selected account type has been updated'));
+    		if (update_account_type($selected_id, $_POST['name'], $_POST['class_id'], $_POST['parent']))
+				display_notification(_('Selected account type has been updated'));
     	} 
     	else 
     	{
-    		add_account_type($_POST['name'], $_POST['class_id'], $_POST['parent']);
-			display_notification(_('New account type has been added'));
+    		if (add_account_type($_POST['id'], $_POST['name'], $_POST['class_id'], $_POST['parent'])) {
+				display_notification(_('New account type has been added'));
+				$Mode = 'RESET';
+			}
     	}
-		$Mode = 'RESET';
 	}
 }
 
@@ -59,10 +75,12 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
 function can_delete($selected_id)
 {
-	if ($selected_id == "")
+	if ($selected_id == -1)
 		return false;
+	$type = db_escape($selected_id);
+
 	$sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_master
-		WHERE account_type=$selected_id";
+		WHERE account_type=$type";
 	$result = db_query($sql, "could not query chart master");
 	$myrow = db_fetch_row($result);
 	if ($myrow[0] > 0) 
@@ -72,7 +90,7 @@ function can_delete($selected_id)
 	}
 
 	$sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_types
-		WHERE parent=$selected_id";
+		WHERE parent=$type";
 	$result = db_query($sql, "could not query chart types");
 	$myrow = db_fetch_row($result);
 	if ($myrow[0] > 0) 
@@ -93,23 +111,25 @@ if ($Mode == 'Delete')
 	if (can_delete($selected_id))
 	{
 		delete_account_type($selected_id);
-		display_notification(_('Selected currency has been deleted'));
+		display_notification(_('Selected account group has been deleted'));
 	}
 	$Mode = 'RESET';
 }
 if ($Mode == 'RESET')
 {
- 	$selected_id = '';
-	$_POST['name']  = '';
+ 	$selected_id = -1;
+	$_POST['id']  = $_POST['name']  = '';
 	unset($_POST['parent']);
 	unset($_POST['class_id']);
 }
 //-----------------------------------------------------------------------------------
 
-$result = get_account_types();
+$result = get_account_types(check_value('show_inactive'));
+
 start_form();
 start_table($table_style);
-$th = array(_("Name"), _("Subgroup Of"), _("Class Type"), "", "");
+$th = array(_("ID"), _("Name"), _("Subgroup Of"), _("Class Type"), "", "");
+inactive_control_column($th);
 table_header($th);
 
 $k = 0;
@@ -120,7 +140,7 @@ while ($myrow = db_fetch($result))
 
 	$bs_text = get_account_class_name($myrow["class_id"]);
 
-	if ($myrow["parent"] == reserved_words::get_any_numeric()) 
+	if ($myrow["parent"] == ANY_NUMERIC) 
 	{
 		$parent_text = "";
 	} 
@@ -129,34 +149,40 @@ while ($myrow = db_fetch($result))
 		$parent_text = get_account_type_name($myrow["parent"]);
 	}
 
+	label_cell($myrow["id"]);
 	label_cell($myrow["name"]);
 	label_cell($parent_text);
 	label_cell($bs_text);
+	inactive_control_cell($myrow["id"], $myrow["inactive"], 'chart_types', 'id');
 	edit_button_cell("Edit".$myrow["id"], _("Edit"));
-	edit_button_cell("Delete".$myrow["id"], _("Delete"));
+	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 ($Mode == 'Edit') 
+if ($selected_id != -1)
 {
-	//editing an existing status code
-	$myrow = get_account_type($selected_id);
-
-	$_POST['name']  = $myrow["name"];
-	$_POST['parent']  = $myrow["parent"];
-	$_POST['class_id']  = $myrow["class_id"];
- }
-	hidden('selected_id', $selected_id);
-
+	if ($Mode == 'Edit') 
+	{
+		//editing an existing status code
+		$myrow = get_account_type($selected_id);
+	
+		$_POST['id']  = $myrow["id"];
+		$_POST['name']  = $myrow["name"];
+		$_POST['parent']  = $myrow["parent"];
+		$_POST['class_id']  = $myrow["class_id"];
+		hidden('selected_id', $selected_id);
+ 	}
+ 	hidden('id');
+	label_row(_("ID:"), $_POST['id']);
+}
+else
+	text_row_ex(_("ID:"), 'id', 4);
 text_row_ex(_("Name:"), 'name', 50);
 
 gl_account_types_list_row(_("Subgroup Of:"), 'parent', null, _("None"), true);
@@ -165,7 +191,7 @@ class_list_row(_("Class Type:"), 'class_id', null);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == '', '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();