Fixed typo in last commit.

[fa-stable.git] / gl / manage / gl_accounts.php

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index db432dcc288209332c2ed9b92f1b285385f5f7e6..0d9b2c755ea1ba9b1d2044500eefea3d46040a29 100644 (file)
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -58,14 +58,13 @@ if (isset($_POST['add']) || isset($_POST['update']))
                $input_error = 1;
                display_error( _("The account name cannot be empty."));
                set_focus('account_name');
-       } 
-       elseif (!$accounts_alpha && !is_numeric($_POST['account_code'])) 
+       }  
+       elseif (!$accounts_alpha && !preg_match("/^[0-9.]+$/",$_POST['account_code'])) // we only allow 0-9 and a dot
        {
            $input_error = 1;
            display_error( _("The account code must be numeric."));
                set_focus('account_code');
        }
-
        if ($input_error != 1)
        {
                if ($accounts_alpha == 2)
@@ -99,6 +98,8 @@ if (isset($_POST['add']) || isset($_POST['update']))
                                        display_notification(_("New account has been added."));
                                        $selected_account = $_POST['AccountList'] = $_POST['account_code'];
                                }
+                       else
+                 display_error(_("Account not added, possible duplicate Account Code."));
                }
                $Ajax->activate('_page_body');
        }
@@ -111,7 +112,7 @@ function can_delete($selected_account)
        if ($selected_account == "")
                return false;
 
-       if (key_in_foreign_table($selected_account, 'gl_trans', 'account', true))
+       if (key_in_foreign_table($selected_account, 'gl_trans', 'account'))
        {
                display_error(_("Cannot delete this account because transactions have been created using this account."));
                return false;
@@ -123,7 +124,7 @@ function can_delete($selected_account)
                return false;
        }
 
-       if (key_in_foreign_table($selected_account, 'bank_accounts', 'account_code', true))     
+       if (key_in_foreign_table($selected_account, 'bank_accounts', 'account_code'))
        {
                display_error(_("Cannot delete this account because it is used by a bank account."));
                return false;