X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_accounts.php;h=2520d355cfd7e43038e023123e378dfa4bc07bcf;hb=bf00f0e16df5974ecba17b59be8bc660bdf6b8a8;hp=1a10f41423395fb8eaff9821279ac4deb84c635d;hpb=97023f8706bb7149c62ca49eaec123cca3c51fa0;p=fa-stable.git diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php index 1a10f414..2520d355 100644 --- a/gl/manage/gl_accounts.php +++ b/gl/manage/gl_accounts.php @@ -14,7 +14,7 @@ check_db_has_gl_account_groups(_("There are no account groups defined. Please de //------------------------------------------------------------------------------------- -if (isset($_POST['Select'])) +if (isset($_POST['_AccountList_update'])) { $_POST['selected_account'] = $_POST['AccountList']; } @@ -41,27 +41,37 @@ if (isset($_POST['add']) || isset($_POST['update'])) { $input_error = 1; display_error( _("The account code must be entered.")); + set_focus('account_code'); } elseif (strlen($_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'])) { $input_error = 1; display_error( _("The account code must be numeric.")); + set_focus('account_code'); } if ($input_error != 1) { 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']); - else + 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.")); + } + else + { add_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'], $_POST['tax_code']); - meta_forward($_SERVER['PHP_SELF']); + $selected_account = $_POST['AccountList'] = $_POST['account_code']; + display_notification(_("New account has been added.")); + } + $Ajax->activate('_page_body'); } } @@ -84,10 +94,6 @@ function can_delete($selected_account) $sql= "SELECT COUNT(*) FROM ".TB_PREF."company WHERE debtors_act='$selected_account' OR pyt_discount_act='$selected_account' OR creditors_act='$selected_account' - OR grn_act='$selected_account' - OR exchange_diff_act='$selected_account' - OR purch_exchange_diff_act='$selected_account' - OR retained_earnings_act='$selected_account' OR freight_act='$selected_account' OR default_sales_act='$selected_account' OR default_sales_discount_act='$selected_account' @@ -96,8 +102,7 @@ function can_delete($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' - OR payroll_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); @@ -179,7 +184,9 @@ if (isset($_POST['delete'])) if (can_delete($selected_account)) { delete_gl_account($selected_account); - meta_forward($_SERVER['PHP_SELF']); + $selected_account = $_POST['account_code'] = $_POST['AccountList'] = ''; + display_notification(_("Selected account has been deleted")); + $Ajax->activate('_page_body'); } } @@ -191,15 +198,12 @@ if (db_has_gl_accounts()) { echo "