projects / fa-stable.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1810bce)
Cleaning from javascript errors.
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Wed, 23 Sep 2009 09:30:57 +0000 (09:30 +0000)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Wed, 23 Sep 2009 09:30:57 +0000 (09:30 +0000)
CHANGELOG.txt patch | blob | history
access/login.php patch | blob | history
admin/fiscalyears.php patch | blob | history

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9a45588ab1cf23ceaef5c4fcec197bd7dde34156..487b05de35eaba014230707d55027a1d50409c13 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+23-Sep-2009 Joe Hunt
+# Cleaning from javascript errors.
+$ /access/login.php
+  /admin/fiscalyears.php
+  
 22-Sep-2009 Joe Hunt
 ! Changed copyright notice in installer files to credit the original copyrighter. GPLv3.
 $ /install/index.php
diff --git a/access/login.php b/access/login.php
index 2779de81551c2ab9ba7edb71e50cc790691ce8f6..18a233b42c246662586200831cff570714cce18b 100644 (file)
--- a/access/login.php
+++ b/access/login.php
@@ -22,7 +22,7 @@ function defaultCompany()
        $js2 = "<script language='JavaScript' type='text/javascript'>
 function set_fullmode() {
        document.getElementById('ui_mode').value = 1;
-       this.form.submit();
+       document.loginform.submit();
        return true;
 }
 </script>";
@@ -52,9 +52,9 @@ function set_fullmode() {
        echo "<head><title>$title</title>\n";
        echo "<meta http-equiv='Content-type' content='text/html; charset=$encoding' />\n";
        echo "<link href='$path_to_root/themes/$def_theme/default.css' rel='stylesheet' type='text/css'> \n";
+       echo $js2;
        if (!$login_timeout)
        {
-               echo $js2;
                echo $js;
        }       
        echo "</head>\n";
diff --git a/admin/fiscalyears.php b/admin/fiscalyears.php
index abff8a968444b66bf5d265adac3ff0f019358c58..cbfdd80e754a12dd9cb2c998ea3d4701f2f8bb55 100644 (file)
--- a/admin/fiscalyears.php
+++ b/admin/fiscalyears.php
@@ -423,9 +423,7 @@ function display_fiscalyears()
                if ($myrow["id"] != $company_year) {
                        delete_button_cell("Delete".$myrow['id'], _("Delete"));
                        submit_js_confirm("Delete".$myrow['id'],
-                               sprintf(_("Are you sure you want to remove fiscal year
-                               '%s'-'%s'? All transactions are removed and converted into relevant
-                               balances. Do you want to continue ?"), $from, $to));
+                               sprintf(_("Are you sure you want to remove fiscal year %s - %s? All transactions are removed and converted into relevant balances. Do you want to continue ?"), $from, $to));
                } else
                        label_cell('');
                end_row();
FrontAccounting stable branch