Merged bugfixes since 2.0.6

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

diff --git a/gl/manage/gl_account_classes.php b/gl/manage/gl_account_classes.php
index cfdff8a817d09e35b90437b1245f59b2b9d0e804..6cc9a6d53aaf428c9773370d56096cebe0cd5c65 100644 (file)
--- a/gl/manage/gl_account_classes.php
+++ b/gl/manage/gl_account_classes.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,24 +19,21 @@ 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 = -1;
+simple_page_mode(true);
 //-----------------------------------------------------------------------------------
 
 function can_process() 
 {
-
+       if (!is_numeric($_POST['id'])) 
+       {
+               display_error( _("The account class ID must be numeric."));
+               set_focus('id');
+               return false;
+       }
        if (strlen($_POST['name']) == 0) 
        {
                display_error( _("The account class name cannot be empty."));
+               set_focus('name');
                return false;
        }
 
@@ -36,7 +42,7 @@ function can_process()
 
 //-----------------------------------------------------------------------------------
 
-if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM'])) 
+if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') 
 {
 
        if (can_process()) 
@@ -44,16 +50,15 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
 
        if ($selected_id != -1) 
        {
-
                update_account_class($selected_id, $_POST['name'], $_POST['Balance']);
-
+                       display_notification(_('Selected account class settings has been updated'));
        } 
        else 
        {
-
                add_account_class($_POST['id'], $_POST['name'], $_POST['Balance']);
+                       display_notification(_('New account class has been added'));
        }
-               meta_forward($_SERVER['PHP_SELF']);
+               $Mode = 'RESET';
        }
 }
 
@@ -79,20 +84,27 @@ function can_delete($selected_id)
 
 //-----------------------------------------------------------------------------------
 
-if (isset($_GET['delete'])) 
+if ($Mode == 'Delete')
 {
 
        if (can_delete($selected_id))
        {
                delete_account_class($selected_id);
-               meta_forward($_SERVER['PHP_SELF']);
+               display_notification(_('Selected account class has been deleted'));
        }
+       $Mode = 'RESET';
 }
 
+//-----------------------------------------------------------------------------------
+if ($Mode == 'RESET')
+{
+       $selected_id = -1;
+       $_POST['id']  = $_POST['name']  = $_POST['Balance'] = '';
+}
 //-----------------------------------------------------------------------------------
 
 $result = get_account_classes();
-
+start_form();
 start_table($table_style);
 $th = array(_("Class ID"), _("Class Name"), _("Balance Sheet"), "", "");
 table_header($th);
@@ -114,31 +126,32 @@ while ($myrow = db_fetch($result))
        label_cell($myrow["cid"]);
        label_cell($myrow['class_name']);
        label_cell($bs_text);
-       edit_link_cell("selected_id=" . $myrow["cid"]);
-       delete_link_cell("selected_id=" . $myrow["cid"]. "&delete=1");
+       edit_button_cell("Edit".$myrow["cid"], _("Edit"));
+       delete_button_cell("Delete".$myrow["cid"], _("Delete"));
        end_row();
 }
 
 end_table();
-
+end_form();
+echo '<br>';
 //-----------------------------------------------------------------------------------
 
-hyperlink_no_params($_SERVER['PHP_SELF'], _("New Account Class"));
-
 start_form();
 
 start_table($table_style2);
 
 if ($selected_id != -1) 
 {
+ if ($Mode == 'Edit') {
        //editing an existing status code
-
        $myrow = get_account_class($selected_id);
 
        $_POST['id']  = $myrow["cid"];
        $_POST['name']  = $myrow["class_name"];
        $_POST['Balance']  = $myrow["balance_sheet"];
        hidden('selected_id', $selected_id);
+ }
+       hidden('id');
        label_row(_("Class ID:"), $_POST['id']);
 
 } 
@@ -148,13 +161,13 @@ else
        text_row_ex(_("Class ID:"), 'id', 3);
 }
 
-text_row_ex(_("Class Name:"), 'name', 50);
+text_row_ex(_("Class Name:"), 'name', 50, 60);
 
 yesno_list_row(_("Balance Sheet:"), 'Balance', null, "", "", false);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1);
+submit_add_or_update_center($selected_id == -1, '', true);
 
 end_form();