Fixed broken table editor page layout on duplicate record error.

[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 94447562edf2a916774ccd0730ac747fbf37642f..b4ca18665f55ce9ea2d70438c53a0c7292333228 100644 (file)
--- a/gl/manage/gl_account_types.php
+++ b/gl/manage/gl_account_types.php
@@ -1,16 +1,16 @@
 <?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.
+       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/agpl-3.0.html>.
+    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"));
@@ -26,6 +26,12 @@ 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."));
@@ -52,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';
        }
 }
 
@@ -115,10 +122,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;
@@ -129,7 +138,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 = "";
        } 
@@ -142,18 +151,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)
@@ -182,7 +189,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();