X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_account_types.php;h=65c0012a0449d3e0e235500ab579c39ebebbbff8;hb=604d89ac6d18712d8b55bed821afe07b7106db3d;hp=915835d81d509a0bb3c71135b1506347363837fa;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php
index 915835d8..65c0012a 100644
--- a/gl/manage/gl_account_types.php
+++ b/gl/manage/gl_account_types.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU Affero General Public License,
+	AGPL, as published by the Free Software Foundation, either version 
+	3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 $page_security = 3;
 $path_to_root="../..";
 include($path_to_root . "/includes/session.inc");
@@ -10,25 +19,23 @@ include($path_to_root . "/gl/includes/gl_db.inc");
 
 include($path_to_root . "/includes/ui.inc");
 
-if (isset($_GET['selected_id']))
-{
-	$selected_id = $_GET['selected_id'];
-} 
-elseif(isset($_POST['selected_id']))
-{
-	$selected_id = $_POST['selected_id'];
-}
-else
-	$selected_id = "";
+simple_page_mode(true);
 //-----------------------------------------------------------------------------------
 
 function can_process() 
 {
 	global $selected_id;
 
+	if (!input_num('id'))
+	{
+	    display_error( _("The account id must be an integer and cannot be empty."));
+	    set_focus('id');
+	    return false;
+	}
 	if (strlen($_POST['name']) == 0) 
 	{
 		display_error( _("The account group name cannot be empty."));
+		set_focus('name');
 		return false;
 	}
 
@@ -43,24 +50,23 @@ function can_process()
 
 //-----------------------------------------------------------------------------------
 
-if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM'])) 
+if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') 
 {
 
 	if (can_process()) 
 	{
 
-    	if ($selected_id != "") 
+    	if ($selected_id != -1) 
     	{
-
     		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['name'], $_POST['class_id'], $_POST['parent']);
+    		add_account_type($_POST['id'], $_POST['name'], $_POST['class_id'], $_POST['parent']);
+			display_notification(_('New account type has been added'));
     	}
-		meta_forward($_SERVER['PHP_SELF']);
+		$Mode = 'RESET';
 	}
 }
 
@@ -68,7 +74,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
 
 function can_delete($selected_id)
 {
-	if ($selected_id == "")
+	if ($selected_id == -1)
 		return false;
 	$sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_master
 		WHERE account_type=$selected_id";
@@ -96,22 +102,29 @@ function can_delete($selected_id)
 
 //-----------------------------------------------------------------------------------
 
-if (isset($_GET['delete'])) 
+if ($Mode == 'Delete')
 {
 
 	if (can_delete($selected_id))
 	{
 		delete_account_type($selected_id);
-		meta_forward($_SERVER['PHP_SELF']);
+		display_notification(_('Selected currency has been deleted'));
 	}
+	$Mode = 'RESET';
+}
+if ($Mode == 'RESET')
+{
+ 	$selected_id = -1;
+	$_POST['id']  = $_POST['name']  = '';
+	unset($_POST['parent']);
+	unset($_POST['class_id']);
 }
-
 //-----------------------------------------------------------------------------------
 
 $result = get_account_types();
-
+start_form();
 start_table($table_style);
-$th = array(_("Name"), _("Subgroup Of"), _("Class Type"), "", "");
+$th = array(_("ID"), _("Name"), _("Subgroup Of"), _("Class Type"), "", "");
 table_header($th);
 
 $k = 0;
@@ -131,46 +144,51 @@ while ($myrow = db_fetch($result))
 		$parent_text = get_account_type_name($myrow["parent"]);
 	}
 
+	label_cell($myrow["id"]);
 	label_cell($myrow["name"]);
 	label_cell($parent_text);
 	label_cell($bs_text);
-	edit_link_cell("selected_id=" . $myrow["id"]);
-	delete_link_cell("selected_id=" . $myrow["id"]. "&delete=1");
+	edit_button_cell("Edit".$myrow["id"], _("Edit"));
+	delete_button_cell("Delete".$myrow["id"], _("Delete"));
 	end_row();
 }
 
 end_table();
-
+end_form();
+echo '<br>';
 //-----------------------------------------------------------------------------------
 
-hyperlink_no_params($_SERVER['PHP_SELF'], _("New Account Group"));
-
 start_form();
 
 start_table($table_style2);
 
-if ($selected_id != "") 
+if ($selected_id != -1)
 {
-	//editing an existing status code
-
-	$myrow = get_account_type($selected_id);
-
-	$_POST['name']  = $myrow["name"];
-	$_POST['parent']  = $myrow["parent"];
-	$_POST['class_id']  = $myrow["class_id"];
-
-	hidden('selected_id', $selected_id);
+	if ($Mode == 'Edit') 
+	{
+		//editing an existing status code
+		$myrow = get_account_type($selected_id);
+	
+		$_POST['id']  = $myrow["id"];
+		$_POST['name']  = $myrow["name"];
+		$_POST['parent']  = $myrow["parent"];
+		$_POST['class_id']  = $myrow["class_id"];
+		hidden('selected_id', $selected_id);
+ 	}
+ 	hidden('id');
+	label_row(_("ID:"), $_POST['id']);
 }
-
+else
+	text_row_ex(_("ID:"), 'id', 4);
 text_row_ex(_("Name:"), 'name', 50);
 
-gl_account_types_list_row(_("Subgroup Of:"), 'parent', null, true, _("None"), true);
+gl_account_types_list_row(_("Subgroup Of:"), 'parent', null, _("None"), true);
 
 class_list_row(_("Class Type:"), 'class_id', null);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == "");
+submit_add_or_update_center($selected_id == -1, '', true);
 
 end_form();