X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_account_classes.php;h=a08a17e4652e40bdc22a97819daec91f6afaec68;hb=9a4dbbda763486152d2e98485a7a2a699426141d;hp=bc141c377828e0418ecef9d98f47ae7e04ec8e90;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git

diff --git a/gl/manage/gl_account_classes.php b/gl/manage/gl_account_classes.php
index bc141c37..a08a17e4 100644
--- a/gl/manage/gl_account_classes.php
+++ b/gl/manage/gl_account_classes.php
@@ -19,25 +19,26 @@ include($path_to_root . "/gl/includes/gl_db.inc");
 
 include($path_to_root . "/includes/ui.inc");
 
-simple_page_mode(true);
+simple_page_mode(false);
 //-----------------------------------------------------------------------------------
 
 function can_process() 
 {
-	global $use_oldstyle_convert;
-	if (!is_numeric($_POST['id'])) 
+	global $SysPrefs;
+
+	if (strlen(trim($_POST['id'])) == 0) 
 	{
-		display_error( _("The account class ID must be numeric."));
+		display_error( _("The account class ID cannot be empty."));
 		set_focus('id');
 		return false;
 	}
-	if (strlen($_POST['name']) == 0) 
+	if (strlen(trim($_POST['name'])) == 0) 
 	{
 		display_error( _("The account class name cannot be empty."));
 		set_focus('name');
 		return false;
 	}
-	if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+	if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
 		$_POST['Balance'] = check_value('Balance');
 	return true;
 }
@@ -50,7 +51,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 	if (can_process()) 
 	{
 
-    	if ($selected_id != -1) 
+    	if ($selected_id != "") 
     	{
     		if(update_account_class($selected_id, $_POST['name'], $_POST['ctype']))
 				display_notification(_('Selected account class settings has been updated'));
@@ -69,13 +70,9 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
 function can_delete($selected_id)
 {
-	if ($selected_id == -1)
+	if ($selected_id == "")
 		return false;
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_types
-		WHERE class_id=$selected_id";
-	$result = db_query($sql, "could not query chart master");
-	$myrow = db_fetch_row($result);
-	if ($myrow[0] > 0) 
+	if (key_in_foreign_table($selected_id, 'chart_types', 'class_id'))	
 	{
 		display_error(_("Cannot delete this account class because GL account types have been created referring to it."));
 		return false;
@@ -101,7 +98,7 @@ if ($Mode == 'Delete')
 //-----------------------------------------------------------------------------------
 if ($Mode == 'RESET')
 {
-	$selected_id = -1;
+	$selected_id = "";
 	$_POST['id']  = $_POST['name']  = $_POST['ctype'] =  '';
 }
 //-----------------------------------------------------------------------------------
@@ -109,9 +106,9 @@ if ($Mode == 'RESET')
 $result = get_account_classes(check_value('show_inactive'));
 
 start_form();
-start_table($table_style);
+start_table(TABLESTYLE);
 $th = array(_("Class ID"), _("Class Name"), _("Class Type"), "", "");
-if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
 	$th[2] = _("Balance Sheet");
 inactive_control_column($th);
 table_header($th);
@@ -119,12 +116,11 @@ table_header($th);
 $k = 0;
 while ($myrow = db_fetch($result)) 
 {
-
 	alt_table_row_color($k);
 
 	label_cell($myrow["cid"]);
-	label_cell($myrow['class_name']);
-	if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+	label_cell('<a href="./gl_account_types.php?cid='.$myrow["cid"].'">'.$myrow['class_name'].'</a>');
+	if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
 	{
 		$myrow['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0);
 		label_cell(($myrow['ctype'] == 1 ? _("Yes") : _("No")));
@@ -140,22 +136,22 @@ inactive_control_row($th);
 end_table(1);
 //-----------------------------------------------------------------------------------
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
-if ($selected_id != -1) 
+if ($selected_id != "") 
 {
- if ($Mode == 'Edit') {
-	//editing an existing status code
-	$myrow = get_account_class($selected_id);
-
-	$_POST['id']  = $myrow["cid"];
-	$_POST['name']  = $myrow["class_name"];
-	if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
-		$_POST['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0);
-	else
-		$_POST['ctype']  = $myrow["ctype"];
-	hidden('selected_id', $selected_id);
- }
+ 	if ($Mode == 'Edit') {
+		//editing an existing status code
+		$myrow = get_account_class($selected_id);
+	
+		$_POST['id']  = $myrow["cid"];
+		$_POST['name']  = $myrow["class_name"];
+		if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
+			$_POST['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0);
+		else
+			$_POST['ctype']  = $myrow["ctype"];
+		hidden('selected_id', $selected_id);
+ 	}
 	hidden('id');
 	label_row(_("Class ID:"), $_POST['id']);
 
@@ -168,14 +164,14 @@ else
 
 text_row_ex(_("Class Name:"), 'name', 50, 60);
 
-if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1)
+if (isset($SysPrefs->use_oldstyle_convert) && $SysPrefs->use_oldstyle_convert == 1)
 	check_row(_("Balance Sheet"), 'ctype', null);
 else
 	class_types_list_row(_("Class Type:"), 'ctype', null);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', 'both');
+submit_add_or_update_center($selected_id == "", '', 'both');
 
 end_form();
 
@@ -183,4 +179,3 @@ end_form();
 
 end_page();
 
-?>