X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fmanage%2Fgl_accounts.php;h=96ba6529d046f326cbb7f832b1fdd4be885a43d2;hb=02dd4aefa3e3babb64d61140bb7f7de14e37f755;hp=5c88705d83c8f9bcd0c7943eccf725d62d775449;hpb=fbb7a3d6150e02e442bd763a717915649fb43437;p=fa-stable.git diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php index 5c88705d..96ba6529 100644 --- a/gl/manage/gl_accounts.php +++ b/gl/manage/gl_accounts.php @@ -1,13 +1,23 @@ . +***********************************************************************/ +$page_security = 'SA_GLACCOUNT'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); -page(_("Chart of Accounts")); +page(_($help_context = "Chart of Accounts")); 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 . "/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.")); @@ -17,6 +27,7 @@ check_db_has_gl_account_groups(_("There are no account groups defined. Please de if (isset($_POST['_AccountList_update'])) { $_POST['selected_account'] = $_POST['AccountList']; + unset($_POST['account_code']); } if (isset($_POST['selected_account'])) @@ -29,7 +40,6 @@ elseif (isset($_GET['selected_account'])) } else $selected_account = ""; - //------------------------------------------------------------------------------------- if (isset($_POST['add']) || isset($_POST['update'])) @@ -60,16 +70,31 @@ if (isset($_POST['add']) || isset($_POST['update'])) { if ($accounts_alpha == 2) $_POST['account_code'] = strtoupper($_POST['account_code']); + + if (!isset($_POST['account_tags'])) + $_POST['account_tags'] = array(); + if ($selected_account) { - update_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'], $_POST['tax_code']); - display_notification(_("Account data has been updated.")); + if (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'); + update_tag_associations(TAG_ACCOUNT, $_POST['account_code'], + $_POST['account_tags']); + $Ajax->activate('account_code'); // in case of status change + display_notification(_("Account data has been updated.")); + } } else { - add_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'], $_POST['tax_code']); - $selected_account = $_POST['AccountList'] = $_POST['account_code']; - display_notification(_("New account has been added.")); + if (add_gl_account($_POST['account_code'], $_POST['account_name'], + $_POST['account_type'], $_POST['account_code2'])) + { + add_tag_associations($_POST['account_code'], $_POST['account_tags']); + display_notification(_("New account has been added.")); + $selected_account = $_POST['AccountList'] = $_POST['account_code']; + } } $Ajax->activate('_page_body'); } @@ -81,98 +106,62 @@ function can_delete($selected_account) { if ($selected_account == "") return false; - $sql= "SELECT COUNT(*) FROM ".TB_PREF."gl_trans WHERE account='$selected_account'"; - $result = db_query($sql,"Couldn't test for existing transactions"); + $acc = db_escape($selected_account); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (key_in_foreign_table($acc, 'gl_trans', 'account', true)) { 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='$selected_account' - OR pyt_discount_act='$selected_account' - OR creditors_act='$selected_account' - OR freight_act='$selected_account' - OR default_sales_act='$selected_account' - OR default_sales_discount_act='$selected_account' - OR default_prompt_payment_act='$selected_account' - OR default_inventory_act='$selected_account' - OR default_cogs_act='$selected_account' - OR default_adj_act='$selected_account' - OR default_inv_sales_act='$selected_account' - OR default_assembly_act='$selected_account'"; - $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($acc)) { 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='$selected_account'"; - $result = db_query($sql,"Couldn't test for bank accounts"); - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (key_in_foreign_table($acc, 'bank_accounts', 'account_code', true)) { 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='$selected_account' - OR cogs_account='$selected_account' - OR adjustment_account='$selected_account' - OR sales_account='$selected_account'"; - $result = db_query($sql,"Couldn't test for existing stock GL codes"); - - $myrow = db_fetch_row($result); - if ($myrow[0] > 0) + if (gl_account_in_stock_category($acc)) + { + 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)) { 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='$selected_account' OR purchasing_gl_code='$selected_account'"; - $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($acc)) { 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='$selected_account' - OR sales_discount_account='$selected_account' - OR receivables_account='$selected_account' - OR payment_discount_account='$selected_account'"; - $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($acc)) { 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='$selected_account' - OR payment_discount_account='$selected_account' - OR payable_account='$selected_account'"; - $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($acc)) { 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)) + { + display_error(_("Cannot delete this account because it is used by one or more Quick Entry Lines.")); + return false; + } + return true; } @@ -184,8 +173,11 @@ if (isset($_POST['delete'])) if (can_delete($selected_account)) { delete_gl_account($selected_account); - $selected_account = $_POST['account_code'] = $_POST['AccountList'] = ''; + $selected_account = $_POST['AccountList'] = ''; + delete_tag_associations(TAG_ACCOUNT,$selected_account, true); + $selected_account = $_POST['AccountList'] = ''; display_notification(_("Selected account has been deleted")); + unset($_POST['account_code']); $Ajax->activate('_page_body'); } } @@ -196,11 +188,17 @@ start_form(); if (db_has_gl_accounts()) { - echo "