X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_accounts.php;h=02a78bc763bf8c5e37a55cfbb1a8b71081001416;hb=a73365128653d7c172874ec53a6da3b4fac69123;hp=2520d355cfd7e43038e023123e378dfa4bc07bcf;hpb=1f0c585ef87e9138499a71ae2954b1a177a6ef97;p=fa-stable.git diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php index 2520d355..02a78bc7 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,16 +70,28 @@ if (isset($_POST['add']) || isset($_POST['update'])) { if ($accounts_alpha == 2) $_POST['account_code'] = strtoupper($_POST['account_code']); + 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'); } @@ -173,6 +195,17 @@ function can_delete($selected_account) return false; } + $sql= "SELECT COUNT(*) FROM ".TB_PREF."quick_entry_lines WHERE + dest_id='$selected_account' 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; } @@ -184,8 +217,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 +232,17 @@ start_form(); if (db_has_gl_accounts()) { - echo "