X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_accounts.php;h=37a9004778aafbaa35d813ca0e7778962ae4ea4d;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=1593863318fb9b7dffd89d8ddd37c7a7305cd046;hpb=cc7638ce7ad1cfca77adbde4ef970499385bf909;p=fa-stable.git diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php index 15938633..37a90047 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")); 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,19 +70,33 @@ 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.")); - $Ajax->activate('_page_body'); + 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'); } } @@ -82,7 +106,9 @@ function can_delete($selected_account) { if ($selected_account == "") return false; - $sql= "SELECT COUNT(*) FROM ".TB_PREF."gl_trans WHERE account='$selected_account'"; + $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); @@ -92,18 +118,18 @@ function can_delete($selected_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'"; + $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); @@ -113,7 +139,7 @@ function can_delete($selected_account) return false; } - $sql= "SELECT COUNT(*) FROM ".TB_PREF."bank_accounts WHERE account_code='$selected_account'"; + $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); @@ -124,10 +150,10 @@ function can_delete($selected_account) } $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'"; + 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"); $myrow = db_fetch_row($result); @@ -137,7 +163,7 @@ function can_delete($selected_account) return false; } - $sql= "SELECT COUNT(*) FROM ".TB_PREF."tax_types WHERE sales_gl_code='$selected_account' OR purchasing_gl_code='$selected_account'"; + $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); @@ -148,10 +174,10 @@ function can_delete($selected_account) } $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'"; + 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); @@ -162,9 +188,9 @@ function can_delete($selected_account) } $sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE - purchase_account='$selected_account' - OR payment_discount_account='$selected_account' - OR payable_account='$selected_account'"; + 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); @@ -174,6 +200,17 @@ function can_delete($selected_account) 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) + { + display_error(_("Cannot delete this account because it is used by one or more Quick Entry Lines.")); + return false; + } + return true; } @@ -185,8 +222,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'); } } @@ -197,11 +237,17 @@ start_form(); if (db_has_gl_accounts()) { - echo "