From e41b7b30847fa2889d67d4e418bb9819a85f065d Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 9 Dec 2008 17:11:15 +0000 Subject: [PATCH] Changed so input of account type is possible (like classes) --- CHANGELOG.txt | 5 ++- gl/includes/db/gl_db_account_types.inc | 17 ++++++-- gl/manage/gl_account_types.php | 57 +++++++++++++++++--------- 3 files changed, 54 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3d91082d..7ac3a3d5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -22,7 +22,10 @@ $ -> Affected files 09-Dec-2008 Joe Hunt # Bug in document right-margin when more than 1 page. $ /reporting/includes/header2.inc - +! Changed so input of account type is possible (like classes) +$ /gl/manage/gl_account_types.php + /gl/includes/db/gl_db_account_types.inc + 08-Dec-2008 Janusz Dobrowolski + Added helpers for list editor F4 calls. $ /includes/ui/ui_controls.inc diff --git a/gl/includes/db/gl_db_account_types.inc b/gl/includes/db/gl_db_account_types.inc index 87ddba3a..7e008f8d 100644 --- a/gl/includes/db/gl_db_account_types.inc +++ b/gl/includes/db/gl_db_account_types.inc @@ -1,9 +1,18 @@ . +***********************************************************************/ +function add_account_type($id, $name, $class_id, $parent) { - $sql = "INSERT INTO ".TB_PREF."chart_types (name, class_id, parent) - VALUES (".db_escape($name).", $class_id, $parent)"; + $sql = "INSERT INTO ".TB_PREF."chart_types (id, name, class_id, parent) + VALUES ($id, ".db_escape($name).", $class_id, $parent)"; db_query($sql, "could not add account type"); } diff --git a/gl/manage/gl_account_types.php b/gl/manage/gl_account_types.php index 4e2ce39f..94447562 100644 --- a/gl/manage/gl_account_types.php +++ b/gl/manage/gl_account_types.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 3; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); @@ -10,7 +19,7 @@ include($path_to_root . "/gl/includes/gl_db.inc"); include($path_to_root . "/includes/ui.inc"); -simple_page_mode(false); +simple_page_mode(true); //----------------------------------------------------------------------------------- function can_process() @@ -41,14 +50,14 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') if (can_process()) { - if ($selected_id != "") + if ($selected_id != -1) { update_account_type($selected_id, $_POST['name'], $_POST['class_id'], $_POST['parent']); display_notification(_('Selected account type has been updated')); } else { - add_account_type($_POST['name'], $_POST['class_id'], $_POST['parent']); + add_account_type($_POST['id'], $_POST['name'], $_POST['class_id'], $_POST['parent']); display_notification(_('New account type has been added')); } $Mode = 'RESET'; @@ -59,7 +68,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') function can_delete($selected_id) { - if ($selected_id == "") + if ($selected_id == -1) return false; $sql= "SELECT COUNT(*) FROM ".TB_PREF."chart_master WHERE account_type=$selected_id"; @@ -99,8 +108,8 @@ if ($Mode == 'Delete') } if ($Mode == 'RESET') { - $selected_id = ''; - $_POST['name'] = ''; + $selected_id = -1; + $_POST['id'] = $_POST['name'] = ''; unset($_POST['parent']); unset($_POST['class_id']); } @@ -109,7 +118,7 @@ if ($Mode == 'RESET') $result = get_account_types(); start_form(); start_table($table_style); -$th = array(_("Name"), _("Subgroup Of"), _("Class Type"), "", ""); +$th = array(_("ID"), _("Name"), _("Subgroup Of"), _("Class Type"), "", ""); table_header($th); $k = 0; @@ -129,11 +138,12 @@ while ($myrow = db_fetch($result)) $parent_text = get_account_type_name($myrow["parent"]); } + label_cell($myrow["id"]); label_cell($myrow["name"]); label_cell($parent_text); label_cell($bs_text); edit_button_cell("Edit".$myrow["id"], _("Edit")); - edit_button_cell("Delete".$myrow["id"], _("Delete")); + delete_button_cell("Delete".$myrow["id"], _("Delete")); end_row(); } @@ -146,17 +156,24 @@ start_form(); start_table($table_style2); -if ($Mode == 'Edit') +if ($selected_id != -1) { - //editing an existing status code - $myrow = get_account_type($selected_id); - - $_POST['name'] = $myrow["name"]; - $_POST['parent'] = $myrow["parent"]; - $_POST['class_id'] = $myrow["class_id"]; - } - hidden('selected_id', $selected_id); - + if ($Mode == 'Edit') + { + //editing an existing status code + $myrow = get_account_type($selected_id); + + $_POST['id'] = $myrow["id"]; + $_POST['name'] = $myrow["name"]; + $_POST['parent'] = $myrow["parent"]; + $_POST['class_id'] = $myrow["class_id"]; + hidden('selected_id', $selected_id); + } + hidden('id'); + label_row(_("ID:"), $_POST['id']); +} +else + text_row_ex(_("ID:"), 'id', 4); text_row_ex(_("Name:"), 'name', 50); gl_account_types_list_row(_("Subgroup Of:"), 'parent', null, _("None"), true); @@ -165,7 +182,7 @@ class_list_row(_("Class Type:"), 'class_id', null); end_table(1); -submit_add_or_update_center($selected_id == '', '', true); +submit_add_or_update_center($selected_id == -1, '', true); end_form(); -- 2.30.2