X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_accounts.php;h=9d7e09189b3378a675d9aaefc634ae5c11c3f679;hb=268a54dcfd08aff7113bc3afe8b784f36db2d0d4;hp=e9efad86bedc6fcde3fde1f5c8292750dbf1f809;hpb=ebc600101ceab69c06eac4b1bd4d1782af45de05;p=fa-stable.git diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php index e9efad86..9d7e0918 100644 --- a/gl/manage/gl_accounts.php +++ b/gl/manage/gl_accounts.php @@ -13,7 +13,11 @@ $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"); @@ -22,6 +26,9 @@ 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'])) @@ -47,28 +54,27 @@ if (isset($_POST['add']) || isset($_POST['update'])) $input_error = 0; - if (strlen($_POST['account_code']) == 0) + if (strlen(trim($_POST['account_code'])) == 0) { $input_error = 1; display_error( _("The account code must be entered.")); set_focus('account_code'); } - elseif (strlen($_POST['account_name']) == 0) + elseif (strlen(trim($_POST['account_name'])) == 0) { $input_error = 1; 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,7 +82,11 @@ if (isset($_POST['add']) || isset($_POST['update'])) if ($selected_account) { - if (update_gl_account($_POST['account_code'], $_POST['account_name'], + 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'], 'chart_master', 'account_code'); @@ -95,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'); } @@ -106,110 +118,59 @@ function can_delete($selected_account) { if ($selected_account == "") return false; - $acc = db_escape($selected_account); - - $sql= "SELECT COUNT(*) FROM ".TB_PREF."gl_trans WHERE account=$acc"; - $result = db_query($sql,"Couldn't test for existing transactions"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + 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; } - $sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE debtors_act=$acc - OR pyt_discount_act=$acc - OR creditors_act=$acc - OR freight_act=$acc - OR default_sales_act=$acc - OR default_sales_discount_act=$acc - OR default_prompt_payment_act=$acc - OR default_inventory_act=$acc - OR default_cogs_act=$acc - OR default_adj_act=$acc - OR default_inv_sales_act=$acc - OR default_assembly_act=$acc"; - $result = db_query($sql,"Couldn't test for default company GL codes"); - - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + 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; } - - $sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_accounts WHERE account_code=$acc"; - $result = db_query($sql,"Couldn't test for bank accounts"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + 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; - } + } - $sql= "SELECT COUNT(*) FROM ".TB_PREF."stock_master WHERE - inventory_account=$acc - OR cogs_account=$acc - OR adjustment_account=$acc - OR sales_account=$acc"; - $result = db_query($sql,"Couldn't test for existing stock GL codes"); + 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; + } - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + 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; - } - - $sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_types WHERE sales_gl_code=$acc OR purchasing_gl_code=$acc"; - $result = db_query($sql,"Couldn't test for existing tax GL codes"); + } - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + 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; - } - - $sql= "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE - sales_account=$acc - OR sales_discount_account=$acc - OR receivables_account=$acc - OR payment_discount_account=$acc"; - $result = db_query($sql,"Couldn't test for existing cust branch GL codes"); - - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + } + + 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; - } - - $sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE - purchase_account=$acc - OR payment_discount_account=$acc - OR payable_account=$acc"; - $result = db_query($sql,"Couldn't test for existing suppliers GL codes"); - - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + } + if (gl_account_in_suppliers($selected_account)) { display_error(_("Cannot delete this account because it is used by one or more suppliers.")); return false; - } - - $sql= "SELECT COUNT(*) FROM ".TB_PREF."quick_entry_lines WHERE - dest_id=$acc AND UPPER(LEFT(action, 1)) <> 'T'"; - $result = db_query($sql,"Couldn't test for existing suppliers GL codes"); + } - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + 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; } @@ -232,15 +193,18 @@ if (isset($_POST['delete'])) } //------------------------------------------------------------------------------------- +$filter_id = (isset($_POST["id"])); start_form(); if (db_has_gl_accounts()) { - start_table("class = 'tablestyle_noborder'"); + 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(); @@ -251,7 +215,7 @@ if (db_has_gl_accounts()) } br(1); -start_table($table_style2); +start_table(TABLESTYLE2); if ($selected_account != "") { @@ -282,11 +246,12 @@ 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', 11); + text_row_ex(_("Account Code:"), 'account_code', 15); } -text_row_ex(_("Account Code 2:"), 'account_code2', 11); +text_row_ex(_("Account Code 2:"), 'account_code2', 15); text_row_ex(_("Account Name:"), 'account_name', 60); @@ -310,4 +275,3 @@ end_form(); end_page(); -?>