X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gl%2Fmanage%2Fgl_accounts.php;h=718be9bd872f692f7b257154933e348a60c8fe65;hb=56631aa65f39f4f2471f1e31350f5b6c912cabbf;hp=5c88705d83c8f9bcd0c7943eccf725d62d775449;hpb=fbb7a3d6150e02e442bd763a717915649fb43437;p=fa-stable.git diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php index 5c88705d..718be9bd 100644 --- a/gl/manage/gl_accounts.php +++ b/gl/manage/gl_accounts.php @@ -1,7 +1,16 @@ . +***********************************************************************/ +$page_security = 'SA_GLACCOUNT'; +$path_to_root = "../.."; include($path_to_root . "/includes/session.inc"); page(_("Chart of Accounts")); @@ -17,6 +26,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'])) @@ -62,14 +72,22 @@ if (isset($_POST['add']) || isset($_POST['update'])) $_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'); + $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'])) + { + display_notification(_("New account has been added.")); + $selected_account = $_POST['AccountList'] = $_POST['account_code']; + } } $Ajax->activate('_page_body'); } @@ -173,6 +191,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 +213,9 @@ 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'] = ''; display_notification(_("Selected account has been deleted")); + unset($_POST['account_code']); $Ajax->activate('_page_body'); } } @@ -196,11 +226,17 @@ start_form(); if (db_has_gl_accounts()) { - echo "