25 files changed, 437 insertions, 32 deletions
diff --git a/LedgerSMB/AA.pm b/LedgerSMB/AA.pm
index f1606153..89d48bab 100755
--- a/LedgerSMB/AA.pm
+++ b/LedgerSMB/AA.pm
@@ -1,6 +1,24 @@
 #=====================================================================
 # LedgerSMB 
 # Small Medium Business Accounting software
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2006
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors:
+#
 # 
 # See COPYRIGHT file for copyright information
 #======================================================================
diff --git a/LedgerSMB/AM.pm b/LedgerSMB/AM.pm
index ed4477bf..a5ebc53b 100755
--- a/LedgerSMB/AM.pm
+++ b/LedgerSMB/AM.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2000
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors: Jim Rawlings <jim@your-dba.com>
+#
 #======================================================================
 #
 # This file has undergone whitespace cleanup.
diff --git a/LedgerSMB/BP.pm b/LedgerSMB/BP.pm
index c1feadc2..7894e4af 100755
--- a/LedgerSMB/BP.pm
+++ b/LedgerSMB/BP.pm
@@ -2,9 +2,25 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
-#======================================================================
+
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
 #
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+#  Copyright (C) 2003
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors: 
+
 # This file has undergone whitespace cleanup.
 #
 #======================================================================
diff --git a/LedgerSMB/CA.pm b/LedgerSMB/CA.pm
index d6df616d..f26547a3 100755
--- a/LedgerSMB/CA.pm
+++ b/LedgerSMB/CA.pm
@@ -2,7 +2,25 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2001
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors:
+#
 #======================================================================
 #
 # This file has undergone whitespace cleanup.
diff --git a/LedgerSMB/CP.pm b/LedgerSMB/CP.pm
index 897783fe..f5c651bb 100755
--- a/LedgerSMB/CP.pm
+++ b/LedgerSMB/CP.pm
@@ -2,7 +2,25 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2003
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors:
+#
+#
 #======================================================================
 #
 # This file has undergone whitespace cleanup.
diff --git a/LedgerSMB/CT.pm b/LedgerSMB/CT.pm
index a99c7292..e79342d1 100755
--- a/LedgerSMB/CT.pm
+++ b/LedgerSMB/CT.pm
@@ -2,7 +2,25 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2000
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors:
+#
+#
 #======================================================================
 #
 # This file has undergone whitespace cleanup.
diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index 399ed98a..9f4f5267 100755
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -2,7 +2,26 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2000
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+# Contributors: Thomas Bayen <bayen@gmx.de>
+#               Antti Kaihola <akaihola@siba.fi>
+#               Moritz Bunkus (tex)
+#               Jim Rawlings <jim@your-dba.com> (DB2)
 #======================================================================
 #
 # This file has undergone whitespace cleanup.
@@ -226,7 +245,7 @@ sub isblank {
 
 sub header {
 
-	my ($self, $init) = @_;
+	my ($self, $init, $headeradd) = @_;
 
 	return if $self->{header};
 
@@ -258,6 +277,7 @@ sub header {
 	$stylesheet
 	$charset
 	<meta name="robots" content="noindex,nofollow" />
+        $headeradd
 </head>
 
 		$self->{pre} \n|;
diff --git a/LedgerSMB/GL.pm b/LedgerSMB/GL.pm
index 7c1d4fdd..3acc8926 100755
--- a/LedgerSMB/GL.pm
+++ b/LedgerSMB/GL.pm
@@ -1,8 +1,25 @@
 #=====================================================================
 # LedgerSMB 
 # Small Medium Business Accounting software
-# 
-# See COPYRIGHT file for copyright information
+#
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2000
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors:
+#
 #======================================================================
 #
 # This file has undergone whitespace cleanup.
diff --git a/LedgerSMB/HR.pm b/LedgerSMB/HR.pm
index 5ff8c253..455b2d1f 100755
--- a/LedgerSMB/HR.pm
+++ b/LedgerSMB/HR.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2003
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors:
+#
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
diff --git a/LedgerSMB/IC.pm b/LedgerSMB/IC.pm
index bcdf9254..69daa53c 100755
--- a/LedgerSMB/IC.pm
+++ b/LedgerSMB/IC.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2000
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors:
+#
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
diff --git a/LedgerSMB/IR.pm b/LedgerSMB/IR.pm
index d06a233c..4020eb36 100755
--- a/LedgerSMB/IR.pm
+++ b/LedgerSMB/IR.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2000
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors: Jim Rawlings <jim@your-dba.com>
+#
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
diff --git a/LedgerSMB/IS.pm b/LedgerSMB/IS.pm
index 324675a6..925fa4d0 100755
--- a/LedgerSMB/IS.pm
+++ b/LedgerSMB/IS.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2000
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors: Jim Rawlings <jim@your-dba.com>
+#`
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
diff --git a/LedgerSMB/Inifile.pm b/LedgerSMB/Inifile.pm
index 0b5055df..801ca0e7 100755
--- a/LedgerSMB/Inifile.pm
+++ b/LedgerSMB/Inifile.pm
@@ -2,7 +2,25 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2002
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors:
+#   Tony Fraser <tony@sybaspace.com>
+#
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
diff --git a/LedgerSMB/JC.pm b/LedgerSMB/JC.pm
index af1ffd40..088fad97 100755
--- a/LedgerSMB/JC.pm
+++ b/LedgerSMB/JC.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2005
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors: 
+#
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
diff --git a/LedgerSMB/Mailer.pm b/LedgerSMB/Mailer.pm
index 4f4b477e..416f383f 100755
--- a/LedgerSMB/Mailer.pm
+++ b/LedgerSMB/Mailer.pm
@@ -1,8 +1,24 @@
 #=====================================================================
 # LedgerSMB 
 # Small Medium Business Accounting software
-# 
-# See COPYRIGHT file for current copyright information
+#
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2002
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors: 
 #
 # Original Author and copyright holder:
 # Dieter Simader dsmimader@sql-ledger.com
diff --git a/LedgerSMB/Menu.pm b/LedgerSMB/Menu.pm
index 723149fd..fb8516e4 100755
--- a/LedgerSMB/Menu.pm
+++ b/LedgerSMB/Menu.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2002
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors: Tony Fraser <tony@sybaspace.com>
+#
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
@@ -27,7 +44,7 @@ sub menuitem {
   my $target = ($self->{$item}{target}) ? $self->{$item}{target} : "";
 
   my $level = $form->escape($item);
-  my $str = qq|<a style="display:block;" href="$module?path=$form->{path}&action=$action&level=$level&login=$form->{login}&timeout=$form->{timeout}&sessionid=$form->{sessionid}&js=$form->{js}|;
+  my $str = qq|<a style="display:block;" href="$module?path=$form->{path}&amp;action=$action&amp;level=$level&amp;login=$form->{login}&amp;timeout=$form->{timeout}&amp;sessionid=$form->{sessionid}&amp;js=$form->{js}|;
 
   my @vars = qw(module action target href);
   
@@ -42,7 +59,7 @@ sub menuitem {
  
   # add other params
   foreach my $key (keys %{ $self->{$item} }) {
-    $str .= "&".$form->escape($key)."=";
+    $str .= "&amp;".$form->escape($key)."=";
     ($value, $conf) = split /=/, $self->{$item}{$key}, 2;
     $value = "$myconfig->{$value}$conf" if $self->{$item}{$key} =~ /=/;
     
diff --git a/LedgerSMB/Num2text.pm b/LedgerSMB/Num2text.pm
index d8ecdef3..01e3c8b7 100755
--- a/LedgerSMB/Num2text.pm
+++ b/LedgerSMB/Num2text.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2002
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors: 
+#
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
diff --git a/LedgerSMB/OE.pm b/LedgerSMB/OE.pm
index 9e82afeb..0c1b1d2c 100755
--- a/LedgerSMB/OE.pm
+++ b/LedgerSMB/OE.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2001
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors:
+#
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
diff --git a/LedgerSMB/OP.pm b/LedgerSMB/OP.pm
index 65b8da31..081abd29 100755
--- a/LedgerSMB/OP.pm
+++ b/LedgerSMB/OP.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2001
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors:
+#
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
diff --git a/LedgerSMB/PE.pm b/LedgerSMB/PE.pm
index d85f4cc3..df7f6abd 100755
--- a/LedgerSMB/PE.pm
+++ b/LedgerSMB/PE.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2003
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors:
+#
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
diff --git a/LedgerSMB/RC.pm b/LedgerSMB/RC.pm
index 8b518cba..5952a2ce 100755
--- a/LedgerSMB/RC.pm
+++ b/LedgerSMB/RC.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2002
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors:
+#
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
diff --git a/LedgerSMB/RP.pm b/LedgerSMB/RP.pm
index 9586c298..fc1e4830 100755
--- a/LedgerSMB/RP.pm
+++ b/LedgerSMB/RP.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2001
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+#
+#  Contributors:
+#
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
diff --git a/LedgerSMB/Session.pm b/LedgerSMB/Session.pm
index d287d199..a1363a25 100755
--- a/LedgerSMB/Session.pm
+++ b/LedgerSMB/Session.pm
@@ -2,7 +2,14 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+#
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.  It is released under the GNU General Public License 
+# Version 2 or, at your option, any later version.  See COPYRIGHT file for 
+# details.
+#
+#
 #======================================================================
 #
 # This file has undergone whitespace cleanup.
diff --git a/LedgerSMB/User.pm b/LedgerSMB/User.pm
index 9eca7197..850dbc69 100755
--- a/LedgerSMB/User.pm
+++ b/LedgerSMB/User.pm
@@ -2,7 +2,24 @@
 # LedgerSMB 
 # Small Medium Business Accounting software
 # 
-# See COPYRIGHT file for copyright information
+# Copyright (C) 2006
+# This work contains copyrighted information from a number of sources all used
+# with permission.
+#
+# This file contains source code included with or based on SQL-Ledger which
+# is Copyright Dieter Simader and DWS Systems Inc. 2000-2005 and licensed
+# under the GNU General Public License version 2 or, at your option, any later
+# version.  For a full list including contact information of contributors,
+# maintainers, and copyright holders, see the CONTRIBUTORS file.
+#
+# Original Copyright Notice from SQL-Ledger 2.6.17 (before the fork):
+# Copyright (C) 2000
+#
+#  Author: DWS Systems Inc.
+#     Web: http://www.sql-ledger.org
+# 
+#  Contributors: Jim Rawlings <jim@your-dba.com>
+#
 #======================================================================
 #
 # This file has NOT undergone whitespace cleanup.
diff --git a/bin/mozilla/pw.pl b/bin/mozilla/pw.pl
index 1b219c8e..5ec4516d 100755
--- a/bin/mozilla/pw.pl
+++ b/bin/mozilla/pw.pl
@@ -18,19 +18,20 @@ sub getpassword {
   my ($s) = @_;
 
   $form->{endsession} = 1;
-  $form->header;
 
   $sessionexpired = qq|<b><font color=red><blink>|.$locale->text('Session expired!').qq|</blink></font></b><p>| if $s;
   
-  print qq|
+  my $headeradd = qq|
 <script language="JavaScript" type="text/javascript">
 <!--
 function sf(){
     document.pw.password.focus();
 }
 // End -->
-</script>
+</script>|;
 
+  $form->header(undef, $headeradd);
+  print qq|
 <body onload="sf()">
 
   $sessionexpired