X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_account_types.php;h=1358cae8d98dc1daccbac5efa4d0a9c599560434;hb=7226477a2624571ba8460f773092f6e38bbc46f3;hp=628cbc2f8ed8a5a5fb9d3c5863e3a6fd8c9af367;hpb=803468dd5b0bb8d84f5366b6465203df12323c99;p=fa-stable.git

diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php
index 628cbc2f..1358cae8 100644
--- a/gl/manage/gl_account_types.php
+++ b/gl/manage/gl_account_types.php
@@ -19,30 +19,37 @@ include($path_to_root . "/gl/includes/gl_db.inc");
 
 include($path_to_root . "/includes/ui.inc");
 
+if (isset($_GET["cid"]))
+	$_POST["cid"] = $_GET["cid"];	
+
 simple_page_mode(false);
 //-----------------------------------------------------------------------------------
 
-function can_process() 
+function can_process($selected_id) 
 {
-	global $selected_id;
-
-	if ($_POST['id'] == "")
+	if (strlen(trim($_POST['id'])) == 0) 
 	{
 	    display_error( _("The account group id cannot be empty."));
 	    set_focus('id');
 	    return false;
 	}
-	if (strlen($_POST['name']) == 0) 
+	if (strlen(trim($_POST['name'])) == 0) 
 	{
 		display_error( _("The account group name cannot be empty."));
 		set_focus('name');
 		return false;
 	}
+	$type = get_account_type(trim($_POST['id']));
+	if ($type && ($type['id'] != $selected_id)) 
+	{
+		display_error( _("This account group id is already in use."));
+		set_focus('id');
+		return false;
+	}
 
-	if (strcmp($_POST['id'], $_POST['parent']) == 0) 
+	if ($_POST['id'] === $_POST['parent']) 
 	{
-		display_error("id = {$_POST['id']}, parent = {$_POST['parent']}");
-		//display_error(_("You cannot set an account group to be a subgroup of itself."));
+		display_error(_("You cannot set an account group to be a subgroup of itself."));
 		return false;
 	}
 
@@ -54,7 +61,7 @@ function can_process()
 if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') 
 {
 
-	if (can_process()) 
+	if (can_process($selected_id)) 
 	{
 
     	if ($selected_id != "") 
@@ -66,27 +73,26 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
     	{
     		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';
 	}
 }
 
 //-----------------------------------------------------------------------------------
 
-function can_delete($selected_id)
+function can_delete($type)
 {
-	if ($selected_id == "")
+	if ($type == "")
 		return false;
-	$type = db_escape($selected_id);
 
-	if (key_in_foreign_table($type, 'chart_master', 'account_type', true))
+	if (key_in_foreign_table($type, 'chart_master', 'account_type'))
 	{
 		display_error(_("Cannot delete this account group because GL accounts have been created referring to it."));
 		return false;
 	}
 
-	if (key_in_foreign_table($type, 'chart_types', 'parent', true))
+	if (key_in_foreign_table($type, 'chart_types', 'parent'))
 	{
 		display_error(_("Cannot delete this account group because GL account groups have been created referring to it."));
 		return false;
@@ -116,12 +122,15 @@ if ($Mode == 'RESET')
 	unset($_POST['class_id']);
 }
 //-----------------------------------------------------------------------------------
-
-$result = get_account_types(check_value('show_inactive'));
+$filter_cid = (isset($_POST["cid"]));
+if ($filter_cid)
+	$result = get_account_types(check_value('show_inactive'), $_POST["cid"]);
+else
+	$result = get_account_types(check_value('show_inactive'));
 
 start_form();
-start_table($table_style);
-$th = array(_("Group ID"), _("Group Name"), _("Subgroup Of"), _("Class Type"), "", "");
+start_table(TABLESTYLE);
+$th = array(_("Group ID"), _("Group Name"), _("Subgroup Of"), _("Class"), "", "");
 inactive_control_column($th);
 table_header($th);
 
@@ -143,7 +152,7 @@ while ($myrow = db_fetch($result))
 	}
 
 	label_cell($myrow["id"]);
-	label_cell($myrow["name"]);
+	label_cell('<a href="./gl_accounts.php?id='.$myrow["id"].'">'.$myrow["name"].'</a>');
 	label_cell($parent_text);
 	label_cell($bs_text);
 	inactive_control_cell($myrow["id"], $myrow["inactive"], 'chart_types', 'id');
@@ -156,7 +165,7 @@ inactive_control_row($th);
 end_table(1);
 //-----------------------------------------------------------------------------------
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != "")
 {
@@ -171,17 +180,24 @@ if ($selected_id != "")
 		if ($_POST['parent'] == '-1')
 			$_POST['parent'] == "";
 		$_POST['class_id']  = $myrow["class_id"];
-		hidden('selected_id', $selected_id);
+		hidden('selected_id', $myrow['id']);
 		hidden('old_id', $myrow["id"]);
  	}
- 	hidden('id');
+ 	else
+ 	{
+		hidden('selected_id', $selected_id);
+		hidden('old_id', $_POST["old_id"]);
+	}	
 }
 text_row_ex(_("ID:"), 'id', 10);
 text_row_ex(_("Name:"), 'name', 50);
 
 gl_account_types_list_row(_("Subgroup Of:"), 'parent', null, _("None"), true);
 
-class_list_row(_("Class Type:"), 'class_id', null);
+if ($filter_cid)
+	class_list_row(_("Class:"), 'class_id', $_POST['cid']);
+else
+	class_list_row(_("Class:"), 'class_id', null);
 
 end_table(1);
 
@@ -193,4 +209,3 @@ end_form();
 
 end_page();
 
-?>