X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_account_types.php;h=1358cae8d98dc1daccbac5efa4d0a9c599560434;hb=df660a601cabb0afe7f3246884f16207b9a0c314;hp=128438433276e087f16fd4f1495e01dbbfac17c7;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php index 12843843..1358cae8 100644 --- a/gl/manage/gl_account_types.php +++ b/gl/manage/gl_account_types.php @@ -13,33 +13,41 @@ $page_security = 'SA_GLACCOUNTGROUP'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("GL Account Groups")); +page(_($help_context = "GL Account Groups")); include($path_to_root . "/gl/includes/gl_db.inc"); include($path_to_root . "/includes/ui.inc"); -simple_page_mode(true); +if (isset($_GET["cid"])) + $_POST["cid"] = $_GET["cid"]; + +simple_page_mode(false); //----------------------------------------------------------------------------------- -function can_process() +function can_process($selected_id) { - global $selected_id; - - if (!input_num('id')) + if (strlen(trim($_POST['id'])) == 0) { - display_error( _("The account id must be an integer and cannot be empty.")); + display_error( _("The account group id cannot be empty.")); set_focus('id'); return false; } - if (strlen($_POST['name']) == 0) + if (strlen(trim($_POST['name'])) == 0) { display_error( _("The account group name cannot be empty.")); set_focus('name'); return false; } + $type = get_account_type(trim($_POST['id'])); + if ($type && ($type['id'] != $selected_id)) + { + display_error( _("This account group id is already in use.")); + set_focus('id'); + return false; + } - if (isset($selected_id) && ($selected_id == $_POST['parent'])) + if ($_POST['id'] === $_POST['parent']) { display_error(_("You cannot set an account group to be a subgroup of itself.")); return false; @@ -53,18 +61,19 @@ function can_process() if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') { - if (can_process()) + if (can_process($selected_id)) { - if ($selected_id != -1) + if ($selected_id != "") { - update_account_type($selected_id, $_POST['name'], $_POST['class_id'], $_POST['parent']); - display_notification(_('Selected account type has been updated')); + if (update_account_type($_POST['id'], $_POST['name'], $_POST['class_id'], $_POST['parent'], $_POST['old_id'])) + 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'; } @@ -72,25 +81,18 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') //----------------------------------------------------------------------------------- -function can_delete($selected_id) +function can_delete($type) { - if ($selected_id == -1) + if ($type == "") return false; - $sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_master - WHERE account_type=$selected_id"; - $result = db_query($sql, "could not query chart master"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + + if (key_in_foreign_table($type, 'chart_master', 'account_type')) { display_error(_("Cannot delete this account group because GL accounts have been created referring to it.")); return false; } - $sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_types - WHERE parent=$selected_id"; - $result = db_query($sql, "could not query chart types"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (key_in_foreign_table($type, 'chart_types', 'parent')) { display_error(_("Cannot delete this account group because GL account groups have been created referring to it.")); return false; @@ -108,24 +110,27 @@ if ($Mode == 'Delete') if (can_delete($selected_id)) { delete_account_type($selected_id); - display_notification(_('Selected currency has been deleted')); + display_notification(_('Selected account group has been deleted')); } $Mode = 'RESET'; } if ($Mode == 'RESET') { - $selected_id = -1; + $selected_id = ""; $_POST['id'] = $_POST['name'] = ''; unset($_POST['parent']); unset($_POST['class_id']); } //----------------------------------------------------------------------------------- - -$result = get_account_types(check_value('show_inactive')); +$filter_cid = (isset($_POST["cid"])); +if ($filter_cid) + $result = get_account_types(check_value('show_inactive'), $_POST["cid"]); +else + $result = get_account_types(check_value('show_inactive')); start_form(); -start_table($table_style); -$th = array(_("ID"), _("Name"), _("Subgroup Of"), _("Class Type"), "", ""); +start_table(TABLESTYLE); +$th = array(_("Group ID"), _("Group Name"), _("Subgroup Of"), _("Class"), "", ""); inactive_control_column($th); table_header($th); @@ -137,7 +142,7 @@ while ($myrow = db_fetch($result)) $bs_text = get_account_class_name($myrow["class_id"]); - if ($myrow["parent"] == ANY_NUMERIC) + if ($myrow["parent"] == '-1') { $parent_text = ""; } @@ -147,7 +152,7 @@ while ($myrow = db_fetch($result)) } label_cell($myrow["id"]); - label_cell($myrow["name"]); + label_cell(''.$myrow["name"].''); label_cell($parent_text); label_cell($bs_text); inactive_control_cell($myrow["id"], $myrow["inactive"], 'chart_types', 'id'); @@ -160,9 +165,9 @@ inactive_control_row($th); end_table(1); //----------------------------------------------------------------------------------- -start_table($table_style2); +start_table(TABLESTYLE2); -if ($selected_id != -1) +if ($selected_id != "") { if ($Mode == 'Edit') { @@ -172,23 +177,31 @@ if ($selected_id != -1) $_POST['id'] = $myrow["id"]; $_POST['name'] = $myrow["name"]; $_POST['parent'] = $myrow["parent"]; + if ($_POST['parent'] == '-1') + $_POST['parent'] == ""; $_POST['class_id'] = $myrow["class_id"]; - hidden('selected_id', $selected_id); + hidden('selected_id', $myrow['id']); + hidden('old_id', $myrow["id"]); } - hidden('id'); - label_row(_("ID:"), $_POST['id']); + else + { + hidden('selected_id', $selected_id); + hidden('old_id', $_POST["old_id"]); + } } -else - text_row_ex(_("ID:"), 'id', 4); +text_row_ex(_("ID:"), 'id', 10); text_row_ex(_("Name:"), 'name', 50); gl_account_types_list_row(_("Subgroup Of:"), 'parent', null, _("None"), true); -class_list_row(_("Class Type:"), 'class_id', null); +if ($filter_cid) + class_list_row(_("Class:"), 'class_id', $_POST['cid']); +else + class_list_row(_("Class:"), 'class_id', null); end_table(1); -submit_add_or_update_center($selected_id == -1, '', 'both'); +submit_add_or_update_center($selected_id == "", '', 'both'); end_form(); @@ -196,4 +209,3 @@ end_form(); end_page(); -?>