Merged changes from main branch up to 2.1.3.

[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 e0b6ff4ef3c54c74f3bf15b9b3bba67aea6c0bdd..7df38e2c4e65eca630e37df3b67bbc17b951435c 100644 (file)
--- a/gl/manage/gl_account_classes.php
+++ b/gl/manage/gl_account_classes.php
@@ -1,13 +1,13 @@
 <?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="../..";
@@ -24,7 +24,12 @@ 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."));
@@ -45,12 +50,12 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
        if ($selected_id != -1) 
        {
-               update_account_class($selected_id, $_POST['name'], $_POST['Balance']);
+               update_account_class($selected_id, $_POST['name'], $_POST['Balance'], $_POST['convert']);
                        display_notification(_('Selected account class settings has been updated'));
        } 
        else 
        {
-               add_account_class($_POST['id'], $_POST['name'], $_POST['Balance']);
+               add_account_class($_POST['id'], $_POST['name'], $_POST['Balance'], $_POST['convert']);
                        display_notification(_('New account class has been added'));
        }
                $Mode = 'RESET';
@@ -94,14 +99,16 @@ if ($Mode == 'Delete')
 if ($Mode == 'RESET')
 {
        $selected_id = -1;
-       $_POST['id']  = $_POST['name']  = $_POST['Balance'] = '';
+       $_POST['id']  = $_POST['name']  = $_POST['Balance'] = $_POST['sign_convert'] = '';
 }
 //-----------------------------------------------------------------------------------
 
-$result = get_account_classes();
+$result = get_account_classes(check_value('show_inactive'));
+
 start_form();
 start_table($table_style);
-$th = array(_("Class ID"), _("Class Name"), _("Balance Sheet"), "", "");
+$th = array(_("Class ID"), _("Class Name"), _("Class Type"), "", "");
+inactive_control_column($th);
 table_header($th);
 
 $k = 0;
@@ -110,29 +117,18 @@ while ($myrow = db_fetch($result))
 
        alt_table_row_color($k);
 
-       if ($myrow["balance_sheet"] == 0) 
-       {
-               $bs_text = _("No");
-       } 
-       else 
-       {
-               $bs_text = _("Yes");
-       }
        label_cell($myrow["cid"]);
        label_cell($myrow['class_name']);
-       label_cell($bs_text);
+       label_cell($class_types[$myrow["balance_sheet"]]);
+       inactive_control_cell($myrow["cid"], $myrow["inactive"], 'chart_class', 'cid');
        edit_button_cell("Edit".$myrow["cid"], _("Edit"));
        delete_button_cell("Delete".$myrow["cid"], _("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) 
@@ -144,6 +140,7 @@ if ($selected_id != -1)
        $_POST['id']  = $myrow["cid"];
        $_POST['name']  = $myrow["class_name"];
        $_POST['Balance']  = $myrow["balance_sheet"];
+       $_POST['convert']  = $myrow["sign_convert"];
        hidden('selected_id', $selected_id);
  }
        hidden('id');
@@ -158,11 +155,13 @@ else
 
 text_row_ex(_("Class Name:"), 'name', 50, 60);
 
-yesno_list_row(_("Balance Sheet:"), 'Balance', null, "", "", false);
+class_types_list_row(_("Class Type:"), 'Balance', null);
+
+yesno_list_row(_("Sign Convert (Balance Sheet/PL statement):"), 'convert', null, "", "", false);
 
 end_table(1);
 
-submit_add_or_update_center($selected_id == -1, '', true);
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();