Pressing the link -Entry customer payment for this invoice- now shows correct branch...

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

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index c47abcc8409fe41381a064165f632ab5c9a68609..3f59c1b2e7d6b5809700ce9c8fde33c692cc9858 100644 (file)
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -59,16 +59,15 @@ if (isset($_POST['add']) || isset($_POST['update']))
                display_error( _("The account name cannot be empty."));
                set_focus('account_name');
        } 
-       elseif (!$accounts_alpha && !is_numeric($_POST['account_code'])) 
+       elseif (!$SysPrefs->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)
+               if ($SysPrefs->accounts_alpha() == 2)
                        $_POST['account_code'] = strtoupper($_POST['account_code']);
 
                if (!isset($_POST['account_tags']))
@@ -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;
@@ -263,4 +264,3 @@ end_form();
 
 end_page();
 
-?>