X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=gl%2Fmanage%2Fgl_accounts.php;h=2520d355cfd7e43038e023123e378dfa4bc07bcf;hb=ab79693b43787b7b91a696a56d6287d87cfebdc1;hp=6e309598387efc9c0d32618566d0a721acb29bba;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php index 6e309598..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,25 +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 (!is_numeric($_POST['account_code'])) + elseif (!$accounts_alpha && !is_numeric($_POST['account_code'])) { - $input_error = 1; - display_error( _("The account code must be numeric.")); + $input_error = 1; + display_error( _("The account code must be numeric.")); + set_focus('account_code'); } if ($input_error != 1) { - if ($selected_account) - update_gl_account($_POST['account_code'], $_POST['account_name'], $_POST['account_type'], $_POST['account_code2'], $_POST['tax_code']); - else + 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.")); + } + 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'); } } @@ -69,7 +81,7 @@ function can_delete($selected_account) { if ($selected_account == "") return false; - $sql= "SELECT COUNT(*) FROM ".TB_PREF."gl_trans WHERE account=$selected_account"; + $sql= "SELECT COUNT(*) FROM ".TB_PREF."gl_trans WHERE account='$selected_account'"; $result = db_query($sql,"Couldn't test for existing transactions"); $myrow = db_fetch_row($result); @@ -79,23 +91,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 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 - 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 - OR payroll_act=$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 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); @@ -105,7 +112,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='$selected_account'"; $result = db_query($sql,"Couldn't test for bank accounts"); $myrow = db_fetch_row($result); @@ -116,10 +123,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='$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); @@ -129,7 +136,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='$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); @@ -140,11 +147,11 @@ 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"; - $result = db_query($sql,"Couldn't test for existing tax GL codes"); + 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) @@ -154,10 +161,10 @@ function can_delete($selected_account) } $sql= "SELECT COUNT(*) FROM ".TB_PREF."suppliers WHERE - purchase_account=$selected_account - payment_discount_account=$selected_account - OR payable_account=$selected_account"; - $result = db_query($sql,"Couldn't test for existing tax GL codes"); + 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) @@ -177,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'); } } @@ -189,15 +198,12 @@ if (db_has_gl_accounts()) { echo "