Version changed to 2.0. Final release

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d0d52fb32348ae83e10686bc35474e7f30dc1efd..9eee9b86bca57ee88f6443b03960dbe2cca6ef78 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,15 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+-------------------------------2.0 Final --------------------------------------------
+21_aug-2008 Joe Hunt
+! config.php file. Version changed to 2.0
+$ config.php
+! Set time out to 120 seconds.
+$ /install/save.php
+! fixing $amp in backup
+$ /js/utils.js
+
 20-Aug-2008 Joe Hunt
 # Bug [0000037] Price diff and deliveries between po receive and supp invoice. (Again)
 $ /includes/db/inventory_db.inc

diff --git a/config.php b/config.php
index 86817e45787f892b77e5651ee7dfeb2a321c4228..731e26f3aaf586121c1e1ea526a73124329ed6bc 100644 (file)
--- a/config.php
+++ b/config.php
@@ -38,7 +38,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        // Main Title
        $app_title = "FrontAccounting";
        // application version
-       $version                = "2.0 RC2";
+       $version                = "2.0";
 
        // Build for development purposes
        $build_version  = date("d.m.Y", filemtime("$path_to_root/CHANGELOG.txt"));
@@ -126,7 +126,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        If the security setting of the page is contained in the security group as determined by the access level then the user will be allowed access.
        Each page has a $page_security = x; variable
        This value is compared to contents of the array applicable which is based on the access level of the user.
-       Access authorisation is checked in session.inc. If you wish to add more security groups 
+       Access authorisation is checked in session.inc. If you wish to add more security groups
        with then you must add a new SecurityHeading to the security_headings array
        and a new array of Security categories to the Security Groups _at_the_end_ of the array
        This mechanism allows more fine grained control of access
@@ -135,7 +135,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
        or by changing the numbers in each array the security access can be tailored. These numbers need to read
        in conjunction with the Page Security index
        Special case is security level 20 which is reserved for admins of first
-       registered company (site admins). All potentially dangerous for whole FA 
+       registered company (site admins). All potentially dangerous for whole FA
        site operations like installing addon modules require access level 20.
        */
 

diff --git a/install/save.php b/install/save.php
index 3044d935575f7d6fe32d3480be00c77ea0436397..32ab2a0fc3a9ac95802d4a5dc42f331d50d84365 100644 (file)
--- a/install/save.php
+++ b/install/save.php
@@ -1,7 +1,7 @@
 <?php
 error_reporting(E_ALL);
 ini_set("display_errors", "On");
-ini_set("max_execution_time", "60");
+ini_set("max_execution_time", "120");
 
 // Start a session
 if(!defined('SESSION_STARTED'))

diff --git a/js/utils.js b/js/utils.js
index 0be2d4867dc1b7322e08500f8e83c2d35e631642..dcc0c8d2823210fa29518a633319e88eefb3b9c7 100644 (file)
--- a/js/utils.js
+++ b/js/utils.js
@@ -180,7 +180,8 @@ function setFocus(name, byId) {
   if(!name) {
        if (_focus)     
                name = _focus;  // last focus set in onfocus handlers
-       else {  // no current focus (first page display) -  set it from from last form
+       else 
+        if (document.forms.length) {   // no current focus (first page display) -  set it from from last form
          var cur = document.getElementsByName('_focus')[document.forms.length-1];
          if(cur) name = cur.value;
        }