X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_account_types.php;h=27141d53d326f8f423c64a77079cdc8276cddf93;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=fd7d92ab700386ca146d0a31954c8e5f11c3d6f4;hpb=902f1015d874c33bd7946b17de2ad80b4f2144b6;p=fa-stable.git

diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php
index fd7d92ab..27141d53 100644
--- a/gl/manage/gl_account_types.php
+++ b/gl/manage/gl_account_types.php
@@ -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($selected_id, $_POST['name'], $_POST['class_id'], $_POST['parent']))
+				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,8 +77,10 @@ function can_delete($selected_id)
 {
 	if ($selected_id == -1)
 		return false;
+	$type = db_escape($selected_id);
+
 	$sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_master
-		WHERE account_type=$selected_id";
+		WHERE account_type=$type";
 	$result = db_query($sql, "could not query chart master");
 	$myrow = db_fetch_row($result);
 	if ($myrow[0] > 0) 
@@ -87,7 +90,7 @@ function can_delete($selected_id)
 	}
 
 	$sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_types
-		WHERE parent=$selected_id";
+		WHERE parent=$type";
 	$result = db_query($sql, "could not query chart types");
 	$myrow = db_fetch_row($result);
 	if ($myrow[0] > 0) 
@@ -108,7 +111,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';
 }
@@ -137,7 +140,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 = "";
 	}