Merging version 2.1 RC to main trunk.

[fa-stable.git] / gl / manage / gl_account_types.php

diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php
index 4e2ce39ffed85b7616aaeca0dacfe04224cdee5a..19093b213f29ad769aa8c3fb9990c42c7a8a6768 100644 (file)
--- 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 General Public License, GPL, 
+       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/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 3;
 $path_to_root="../..";
 include($path_to_root . "/includes/session.inc");
@@ -10,13 +19,19 @@ include($path_to_root . "/gl/includes/gl_db.inc");
 
 include($path_to_root . "/includes/ui.inc");
 
-simple_page_mode(false);
+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."));
@@ -41,14 +56,14 @@ 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'));
        }
                $Mode = 'RESET';
@@ -59,7 +74,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='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";
@@ -99,8 +114,8 @@ if ($Mode == 'Delete')
 }
 if ($Mode == 'RESET')
 {
-       $selected_id = '';
-       $_POST['name']  = '';
+       $selected_id = -1;
+       $_POST['id']  = $_POST['name']  = '';
        unset($_POST['parent']);
        unset($_POST['class_id']);
 }
@@ -109,7 +124,7 @@ if ($Mode == 'RESET')
 $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;
@@ -129,11 +144,12 @@ 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_button_cell("Edit".$myrow["id"], _("Edit"));
-       edit_button_cell("Delete".$myrow["id"], _("Delete"));
+       delete_button_cell("Delete".$myrow["id"], _("Delete"));
        end_row();
 }
 
@@ -146,17 +162,24 @@ start_form();
 
 start_table($table_style2);
 
-if ($Mode == 'Edit') 
+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, _("None"), true);
@@ -165,7 +188,7 @@ class_list_row(_("Class Type:"), 'class_id', null);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == '', '', true);
+submit_add_or_update_center($selected_id == -1, '', true);
 
 end_form();