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 f92d5b2589dd35ca83bd96e365d014dce4bb5c01..7df38e2c4e65eca630e37df3b67bbc17b951435c 100644 (file)
--- a/gl/manage/gl_account_classes.php
+++ b/gl/manage/gl_account_classes.php
@@ -103,10 +103,12 @@ if ($Mode == 'RESET')
 }
 //-----------------------------------------------------------------------------------
 
-$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"), _("Sign Convert"), "", "");
+$th = array(_("Class ID"), _("Class Name"), _("Class Type"), "", "");
+inactive_control_column($th);
 table_header($th);
 
 $k = 0;
@@ -115,38 +117,18 @@ while ($myrow = db_fetch($result))
 
        alt_table_row_color($k);
 
-       if ($myrow["balance_sheet"] == 0) 
-       {
-               $bs_text = _("No");
-       } 
-       else 
-       {
-               $bs_text = _("Yes");
-       }
-       if ($myrow["sign_convert"] == 0) 
-       {
-               $sc_text = _("No");
-       } 
-       else 
-       {
-               $sc_text = _("Yes");
-       }
        label_cell($myrow["cid"]);
        label_cell($myrow['class_name']);
-       label_cell($bs_text);
-       label_cell($sc_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) 
@@ -173,7 +155,7 @@ 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);