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

diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php
index cad41fbb..1358cae8 100644
--- a/gl/manage/gl_account_types.php
+++ b/gl/manage/gl_account_types.php
@@ -19,27 +19,35 @@ include($path_to_root . "/gl/includes/gl_db.inc");
 
 include($path_to_root . "/includes/ui.inc");
 
-simple_page_mode(true);
+if (isset($_GET["cid"]))
+	$_POST["cid"] = $_GET["cid"];	
+
+simple_page_mode(false);
 //-----------------------------------------------------------------------------------
 
-function can_process() 
+function can_process($selected_id) 
 {
-	global $selected_id;
-
-	if (!input_num('id'))
+	if (strlen(trim($_POST['id'])) == 0) 
 	{
-	    display_error( _("The account id must be an integer and cannot be empty."));
+	    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 (isset($selected_id) && ($selected_id == $_POST['parent'])) 
+	if ($_POST['id'] === $_POST['parent']) 
 	{
 		display_error(_("You cannot set an account group to be a subgroup of itself."));
 		return false;
@@ -53,39 +61,38 @@ function can_process()
 if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') 
 {
 
-	if (can_process()) 
+	if (can_process($selected_id)) 
 	{
 
-    	if ($selected_id != -1) 
+    	if ($selected_id != "") 
     	{
-    		if (update_account_type($selected_id, $_POST['name'], $_POST['class_id'], $_POST['parent']))
+    		if (update_account_type($_POST['id'], $_POST['name'], $_POST['class_id'], $_POST['parent'], $_POST['old_id']))
 				display_notification(_('Selected account type has been updated'));
     	} 
     	else 
     	{
     		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 == -1)
+	if ($type == "")
 		return false;
-	$type = db_escape($selected_id);
 
-	if (account_type_in_chart_master($type))
+	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 (account_type_in_parent($type))
+	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;
@@ -109,18 +116,21 @@ if ($Mode == 'Delete')
 }
 if ($Mode == 'RESET')
 {
- 	$selected_id = -1;
+ 	$selected_id = "";
 	$_POST['id']  = $_POST['name']  = '';
 	unset($_POST['parent']);
 	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(_("ID"), _("Name"), _("Subgroup Of"), _("Class Type"), "", "");
+start_table(TABLESTYLE);
+$th = array(_("Group ID"), _("Group Name"), _("Subgroup Of"), _("Class"), "", "");
 inactive_control_column($th);
 table_header($th);
 
@@ -132,7 +142,7 @@ while ($myrow = db_fetch($result))
 
 	$bs_text = get_account_class_name($myrow["class_id"]);
 
-	if ($myrow["parent"] == ANY_NUMERIC) 
+	if ($myrow["parent"] == '-1') 
 	{
 		$parent_text = "";
 	} 
@@ -142,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');
@@ -155,9 +165,9 @@ inactive_control_row($th);
 end_table(1);
 //-----------------------------------------------------------------------------------
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
-if ($selected_id != -1)
+if ($selected_id != "")
 {
 	if ($Mode == 'Edit') 
 	{
@@ -167,23 +177,31 @@ if ($selected_id != -1)
 		$_POST['id']  = $myrow["id"];
 		$_POST['name']  = $myrow["name"];
 		$_POST['parent']  = $myrow["parent"];
+		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');
-	label_row(_("ID:"), $_POST['id']);
+ 	else
+ 	{
+		hidden('selected_id', $selected_id);
+		hidden('old_id', $_POST["old_id"]);
+	}	
 }
-else
-	text_row_ex(_("ID:"), 'id', 4);
+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);
 
-submit_add_or_update_center($selected_id == -1, '', 'both');
+submit_add_or_update_center($selected_id == "", '', 'both');
 
 end_form();
 
@@ -191,4 +209,3 @@ end_form();
 
 end_page();
 
-?>