X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_account_types.php;h=ef8207b1728afe9d969e19727afa7c8ec9d3c997;hb=3d154c1be37111f3659ad0d1a28b2576a51fdd38;hp=19093b213f29ad769aa8c3fb9990c42c7a8a6768;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git

diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php
index 19093b21..ef8207b1 100644
--- a/gl/manage/gl_account_types.php
+++ b/gl/manage/gl_account_types.php
@@ -9,11 +9,11 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 3;
-$path_to_root="../..";
+$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");
 
@@ -58,15 +58,16 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
     	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($_POST['id'], $_POST['name'], $_POST['class_id'], $_POST['parent'], $_POST['old_id']))
+				display_notification(_('Selected account type has been updated'));
     	} 
     	else 
     	{
-    		add_account_type($_POST['id'], $_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';
 	}
 }
 
@@ -76,21 +77,15 @@ function can_delete($selected_id)
 {
 	if ($selected_id == -1)
 		return false;
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_master
-		WHERE account_type=$selected_id";
-	$result = db_query($sql, "could not query chart master");
-	$myrow = db_fetch_row($result);
-	if ($myrow[0] > 0) 
+	$type = db_escape($selected_id);
+
+	if (key_in_foreign_table($type, 'chart_master', 'account_type', true))
 	{
 		display_error(_("Cannot delete this account group because GL accounts have been created referring to it."));
 		return false;
 	}
 
-	$sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_types
-		WHERE parent=$selected_id";
-	$result = db_query($sql, "could not query chart types");
-	$myrow = db_fetch_row($result);
-	if ($myrow[0] > 0) 
+	if (key_in_foreign_table($type, 'chart_types', 'parent', true))
 	{
 		display_error(_("Cannot delete this account group because GL account groups have been created referring to it."));
 		return false;
@@ -108,7 +103,7 @@ 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';
 }
@@ -121,10 +116,12 @@ if ($Mode == 'RESET')
 }
 //-----------------------------------------------------------------------------------
 
-$result = get_account_types();
+$result = get_account_types(check_value('show_inactive'));
+
 start_form();
 start_table($table_style);
 $th = array(_("ID"), _("Name"), _("Subgroup Of"), _("Class Type"), "", "");
+inactive_control_column($th);
 table_header($th);
 
 $k = 0;
@@ -135,7 +132,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 = "";
 	} 
@@ -148,18 +145,16 @@ while ($myrow = db_fetch($result))
 	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"));
 	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 ($selected_id != -1)
@@ -174,12 +169,13 @@ if ($selected_id != -1)
 		$_POST['parent']  = $myrow["parent"];
 		$_POST['class_id']  = $myrow["class_id"];
 		hidden('selected_id', $selected_id);
+		hidden('old_id', $myrow["id"]);
  	}
  	hidden('id');
-	label_row(_("ID:"), $_POST['id']);
+	text_row_ex(_("ID:"), 'id', 10);
 }
 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);
@@ -188,7 +184,7 @@ class_list_row(_("Class Type:"), 'class_id', null);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();