X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_account_classes.php;h=d90a952402b033d33a51f0d19eb68f2289a98aba;hb=0bf933423b9645bcb57390c478d4fdaf0c895049;hp=5cd8c5b89abfba5ad4554419e9283da49c267973;hpb=3626626c1d1497affa0e1b1f7da41c656e78a385;p=fa-stable.git diff --git a/gl/manage/gl_account_classes.php b/gl/manage/gl_account_classes.php index 5cd8c5b8..d90a9524 100644 --- a/gl/manage/gl_account_classes.php +++ b/gl/manage/gl_account_classes.php @@ -1,10 +1,19 @@ . +***********************************************************************/ +$page_security = 'SA_GLACCOUNTCLASS'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("GL Account Classes")); +page(_($help_context = "GL Account Classes")); include($path_to_root . "/gl/includes/gl_db.inc"); @@ -15,14 +24,21 @@ simple_page_mode(true); function can_process() { - + global $use_oldstyle_convert; + 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; } - + if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1) + $_POST['Balance'] = check_value('Balance'); return true; } @@ -36,15 +52,16 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') if ($selected_id != -1) { - update_account_class($selected_id, $_POST['name'], $_POST['Balance']); - display_notification('Selected account class settings has been updated'); + if(update_account_class($selected_id, $_POST['name'], $_POST['ctype'])) + 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'); + if(add_account_class($_POST['id'], $_POST['name'], $_POST['ctype'])) { + display_notification(_('New account class has been added')); + $Mode = 'RESET'; + } } - $Mode = 'RESET'; } } @@ -54,11 +71,7 @@ function can_delete($selected_id) { if ($selected_id == -1) return false; - $sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_types - WHERE class_id=$selected_id"; - $result = db_query($sql, "could not query chart master"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (account_class_in_account_types($selected_id)) { display_error(_("Cannot delete this account class because GL account types have been created referring to it.")); return false; @@ -76,23 +89,27 @@ if ($Mode == 'Delete') if (can_delete($selected_id)) { delete_account_class($selected_id); - display_notification('Selected account class has been deleted'); - $Mode = 'RESET'; + display_notification(_('Selected account class has been deleted')); } + $Mode = 'RESET'; } //----------------------------------------------------------------------------------- if ($Mode == 'RESET') { $selected_id = -1; - $_POST['id'] = $_POST['name'] = $_POST['Balance'] = ''; + $_POST['id'] = $_POST['name'] = $_POST['ctype'] = ''; } //----------------------------------------------------------------------------------- -$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"), "", ""); +if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1) + $th[2] = _("Balance Sheet"); +inactive_control_column($th); table_header($th); $k = 0; @@ -101,29 +118,24 @@ 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); + if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1) + { + $myrow['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0); + label_cell(($myrow['ctype'] == 1 ? _("Yes") : _("No"))); + } + else + label_cell($class_types[$myrow["ctype"]]); + inactive_control_cell($myrow["cid"], $myrow["inactive"], 'chart_class', 'cid'); edit_button_cell("Edit".$myrow["cid"], _("Edit")); - edit_button_cell("Delete".$myrow["cid"], _("Delete")); + delete_button_cell("Delete".$myrow["cid"], _("Delete")); end_row(); } - -end_table(); -end_form(); -echo '
'; +inactive_control_row($th); +end_table(1); //----------------------------------------------------------------------------------- -start_form(); - start_table($table_style2); if ($selected_id != -1) @@ -134,7 +146,10 @@ if ($selected_id != -1) $_POST['id'] = $myrow["cid"]; $_POST['name'] = $myrow["class_name"]; - $_POST['Balance'] = $myrow["balance_sheet"]; + if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1) + $_POST['ctype'] = ($myrow["ctype"] >= CL_ASSETS && $myrow["ctype"] < CL_INCOME ? 1 : 0); + else + $_POST['ctype'] = $myrow["ctype"]; hidden('selected_id', $selected_id); } hidden('id'); @@ -147,13 +162,16 @@ 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); +if (isset($use_oldstyle_convert) && $use_oldstyle_convert == 1) + check_row(_("Balance Sheet"), 'ctype', null); +else + class_types_list_row(_("Class Type:"), 'ctype', null); end_table(1); -submit_add_or_update_center($selected_id == -1); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form();