Release 2.4.8

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

diff --git a/gl/manage/gl_accounts.php b/gl/manage/gl_accounts.php
index 3f59c1b2e7d6b5809700ce9c8fde33c692cc9858..9d7e09189b3378a675d9aaefc634ae5c11c3f679 100644 (file)
--- a/gl/manage/gl_accounts.php
+++ b/gl/manage/gl_accounts.php
@@ -13,7 +13,11 @@ $page_security = 'SA_GLACCOUNT';
 $path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
 
-page(_($help_context = "Chart of Accounts"));
+$js = "";
+if ($SysPrefs->use_popup_windows && $SysPrefs->use_popup_search)
+       $js .= get_js_open_window(900, 500);
+
+page(_($help_context = "Chart of Accounts"), false, false, "", $js);
 
 include($path_to_root . "/includes/ui.inc");
 include($path_to_root . "/gl/includes/gl_db.inc");
@@ -22,6 +26,9 @@ include_once($path_to_root . "/includes/data_checks.inc");
 
 check_db_has_gl_account_groups(_("There are no account groups defined. Please define at least one account group before entering accounts."));
 
+if (isset($_GET["id"]))
+       $_POST["id"] = $_GET["id"];     
+
 //-------------------------------------------------------------------------------------
 
 if (isset($_POST['_AccountList_update'])) 
@@ -59,7 +66,7 @@ if (isset($_POST['add']) || isset($_POST['update']))
                display_error( _("The account name cannot be empty."));
                set_focus('account_name');
        } 
-       elseif (!$SysPrefs->accounts_alpha() && !is_numeric($_POST['account_code'])) 
+       elseif (!$SysPrefs->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."));
@@ -186,6 +193,7 @@ if (isset($_POST['delete']))
 } 
 
 //-------------------------------------------------------------------------------------
+$filter_id = (isset($_POST["id"]));
 
 start_form();
 
@@ -193,8 +201,10 @@ if (db_has_gl_accounts())
 {
        start_table(TABLESTYLE_NOBORDER);
        start_row();
-    gl_all_accounts_list_cells(null, 'AccountList', null, false, false,
-               _('New account'), true, check_value('show_inactive'));
+       if ($filter_id)
+               gl_all_accounts_list_cells(null, 'AccountList', null, false, false, _('New account'), true, check_value('show_inactive'), $_POST['id']);
+       else
+               gl_all_accounts_list_cells(null, 'AccountList', null, false, false, _('New account'), true, check_value('show_inactive'));
        check_cells(_("Show inactive:"), 'show_inactive', null, true);
        end_row();
        end_table();
@@ -236,6 +246,7 @@ else
                $_POST['account_code'] = $_POST['account_code2'] = '';
                $_POST['account_name']  = $_POST['account_type'] = '';
                $_POST['inactive'] = 0;
+               if ($filter_id) $_POST['account_type'] = $_POST['id'];
        }
        text_row_ex(_("Account Code:"), 'account_code', 15);
 }