X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_account_types.php;h=1358cae8d98dc1daccbac5efa4d0a9c599560434;hb=df660a601cabb0afe7f3246884f16207b9a0c314;hp=b3e56aca8b1a82e0df8f46191bb709986f37fbd7;hpb=52f1b29671276f9318e03248d788186b911a00a9;p=fa-stable.git

diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php
index b3e56aca..1358cae8 100644
--- a/gl/manage/gl_account_types.php
+++ b/gl/manage/gl_account_types.php
@@ -19,6 +19,9 @@ 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);
 //-----------------------------------------------------------------------------------
 
@@ -44,7 +47,6 @@ function can_process($selected_id)
 		return false;
 	}
 
-	//if (strcmp($_POST['id'], $_POST['parent']) == 0) 
 	if ($_POST['id'] === $_POST['parent']) 
 	{
 		display_error(_("You cannot set an account group to be a subgroup of itself."));
@@ -79,19 +81,18 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
 //-----------------------------------------------------------------------------------
 
-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;
@@ -121,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(TABLESTYLE);
-$th = array(_("Group ID"), _("Group Name"), _("Subgroup Of"), _("Class Type"), "", "");
+$th = array(_("Group ID"), _("Group Name"), _("Subgroup Of"), _("Class"), "", "");
 inactive_control_column($th);
 table_header($th);
 
@@ -148,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');
@@ -190,7 +194,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);
 
@@ -202,4 +209,3 @@ end_form();
 
 end_page();
 
-?>