X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_accounts.php;h=46598f97b9b90e1d78fafbabb1743b5dbb15e6fe;hb=2ce280fb8619210f21485b723ec4cb2b306fcce9;hp=5d918cc8e8a1e559635abd2d8756a4a98c27e1b6;hpb=e05281d838989a2e05b5f916a0bacd6d3f2cc3f0;p=fa-stable.git diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php index 5d918cc8..46598f97 100644 --- a/gl/manage/gl_accounts.php +++ b/gl/manage/gl_accounts.php @@ -12,16 +12,23 @@ $page_security = 'SA_GLACCOUNT'; $path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); - -page(_($help_context = "Chart of Accounts")); + +$js = ""; +if ($SysPrefs->use_popup_windows && $SysPrefs->use_popup_search) + $js .= get_js_open_window(900, 500); + +page(_($help_context = "Chart of Accounts"), false, false, "", $js); include($path_to_root . "/includes/ui.inc"); include($path_to_root . "/gl/includes/gl_db.inc"); -include($path_to_root . "/admin/db/tags_db.inc"); +include_once($path_to_root . "/admin/db/tags_db.inc"); include_once($path_to_root . "/includes/data_checks.inc"); check_db_has_gl_account_groups(_("There are no account groups defined. Please define at least one account group before entering accounts.")); +if (isset($_GET["id"])) + $_POST["id"] = $_GET["id"]; + //------------------------------------------------------------------------------------- if (isset($_POST['_AccountList_update'])) @@ -59,16 +66,15 @@ if (isset($_POST['add']) || isset($_POST['update'])) display_error( _("The account name cannot be empty.")); set_focus('account_name'); } - elseif (!$accounts_alpha && !is_numeric($_POST['account_code'])) + elseif (!$SysPrefs->accounts_alpha() && !preg_match("/^[0-9.]+$/",$_POST['account_code'])) // we only allow 0-9 and a dot { $input_error = 1; display_error( _("The account code must be numeric.")); set_focus('account_code'); } - if ($input_error != 1) { - if ($accounts_alpha == 2) + if ($SysPrefs->accounts_alpha() == 2) $_POST['account_code'] = strtoupper($_POST['account_code']); if (!isset($_POST['account_tags'])) @@ -76,10 +82,10 @@ if (isset($_POST['add']) || isset($_POST['update'])) if ($selected_account) { - if (check_value('inactive') && is_bank_account($_POST['account_code'])) + if (get_post('inactive') == 1 && is_bank_account($_POST['account_code'])) { display_error(_("The account belongs to a bank account and cannot be inactivated.")); - } + } elseif (update_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'])) { update_record_status($_POST['account_code'], $_POST['inactive'], @@ -99,6 +105,8 @@ if (isset($_POST['add']) || isset($_POST['update'])) display_notification(_("New account has been added.")); $selected_account = $_POST['AccountList'] = $_POST['account_code']; } + else + display_error(_("Account not added, possible duplicate Account Code.")); } $Ajax->activate('_page_body'); } @@ -110,61 +118,59 @@ function can_delete($selected_account) { if ($selected_account == "") return false; - $acc = db_escape($selected_account); - if (key_in_foreign_table($acc, 'gl_trans', 'account', true)) + if (key_in_foreign_table($selected_account, 'gl_trans', 'account')) { display_error(_("Cannot delete this account because transactions have been created using this account.")); return false; } - if (gl_account_in_company_defaults($acc)) + if (gl_account_in_company_defaults($selected_account)) { display_error(_("Cannot delete this account because it is used as one of the company default GL accounts.")); return false; } - if (key_in_foreign_table($acc, 'bank_accounts', 'account_code', true)) + if (key_in_foreign_table($selected_account, 'bank_accounts', 'account_code')) { display_error(_("Cannot delete this account because it is used by a bank account.")); return false; - } + } - if (gl_account_in_stock_category($acc)) + if (gl_account_in_stock_category($selected_account)) { display_error(_("Cannot delete this account because it is used by one or more Item Categories.")); return false; - } - - if (gl_account_in_stock_master($acc)) + } + + if (gl_account_in_stock_master($selected_account)) { display_error(_("Cannot delete this account because it is used by one or more Items.")); return false; - } - - if (gl_account_in_tax_types($acc)) + } + + if (gl_account_in_tax_types($selected_account)) { display_error(_("Cannot delete this account because it is used by one or more Taxes.")); return false; - } - - if (gl_account_in_cust_branch($acc)) + } + + if (gl_account_in_cust_branch($selected_account)) { display_error(_("Cannot delete this account because it is used by one or more Customer Branches.")); return false; - } - - if (gl_account_in_suppliers($acc)) + } + if (gl_account_in_suppliers($selected_account)) { display_error(_("Cannot delete this account because it is used by one or more suppliers.")); return false; - } - - if (gl_account_in_quick_entry_lines($acc)) + } + + if (gl_account_in_quick_entry_lines($selected_account)) { display_error(_("Cannot delete this account because it is used by one or more Quick Entry Lines.")); return false; - } + } return true; } @@ -187,6 +193,7 @@ if (isset($_POST['delete'])) } //------------------------------------------------------------------------------------- +$filter_id = (isset($_POST["id"])); start_form(); @@ -194,8 +201,10 @@ if (db_has_gl_accounts()) { start_table(TABLESTYLE_NOBORDER); start_row(); - gl_all_accounts_list_cells(null, 'AccountList', null, false, false, - _('New account'), true, check_value('show_inactive')); + if ($filter_id) + gl_all_accounts_list_cells(null, 'AccountList', null, false, false, _('New account'), true, check_value('show_inactive'), $_POST['id']); + else + gl_all_accounts_list_cells(null, 'AccountList', null, false, false, _('New account'), true, check_value('show_inactive')); check_cells(_("Show inactive:"), 'show_inactive', null, true); end_row(); end_table(); @@ -237,6 +246,7 @@ else $_POST['account_code'] = $_POST['account_code2'] = ''; $_POST['account_name'] = $_POST['account_type'] = ''; $_POST['inactive'] = 0; + if ($filter_id) $_POST['account_type'] = $_POST['id']; } text_row_ex(_("Account Code:"), 'account_code', 15); } @@ -265,4 +275,3 @@ end_form(); end_page(); -?>