diff --git a/build/.cvsignore b/build/.cvsignore
index 53dd6ee2abd..830b8b91924 100644
--- a/build/.cvsignore
+++ b/build/.cvsignore
@@ -14,6 +14,3 @@ version-phpsane.txt
 makepack-phpsane.conf
 html
 *.deb
-*.dsc
-*.tar.gz
-*.changes
diff --git a/build/deb/README b/build/deb/README
index edb46ffd5a3..76be8f1596c 100644
--- a/build/deb/README
+++ b/build/deb/README
@@ -49,5 +49,5 @@ For first ITP submission of Dolibarr, bug id was 634783.
 - Call for a mentor on ML debian-mentors to upload packages
 
 - Once package is uploaded, following URL are available:
-http://packages.qa.debian.org/package.html
+http://packages.qa.debian.org/package
 http://bugs.debian.org/package
diff --git a/build/deb/changelog b/build/deb/changelog
index b035f18ae1d..47667b3cfb5 100644
--- a/build/deb/changelog
+++ b/build/deb/changelog
@@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low
   * New upstream release.
     closes: bug#634783
     
- -- Laurent Destailleur <eldy@users.sourceforge.net>  Mon, 30 Jul 2011 12:00:00 +0100     
+ -- Laurent Destailleur <eldy@users.sourceforge.net>  Mon, 18 Jul 2011 12:00:00 +0100     
 
-# For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. 
\ No newline at end of file
+# More information into /usr/share/dolibarr/ChangeLog file. 
\ No newline at end of file
diff --git a/build/deb/install.forced.php.install b/build/deb/install.forced.php.install
index 7de8616ac15..c266426209b 100755
--- a/build/deb/install.forced.php.install
+++ b/build/deb/install.forced.php.install
@@ -4,19 +4,19 @@
 // This file must be present into htdocs/install directory
 // during install process to be used.
 //
-// $Id: install.forced.php.install,v 1.9 2011/07/30 14:56:12 eldy Exp $
+// $Id: install.forced.php.install,v 1.8 2011/07/27 16:45:47 eldy Exp $
 //
 
-$force_install_noedit=2;
+$force_install_noedit=1;
 $force_install_message='KeepDefaultValuesDeb';
 #$force_install_main_data_root='/usr/share/dolibarr/documents';
 $force_install_main_data_root='/var/lib/dolibarr/documents';
 $force_install_type='mysqli';
 $force_install_dbserver='localhost';
 $force_install_port='3306';
-$force_install_database='dolibarrdebian';
+$force_install_database='dolibarr';
 $force_install_createdatabase='1';
-$force_install_databaselogin='dolibarrdebian';
+$force_install_databaselogin='dolibarrmysql';
 $force_install_databasepass='';
 $force_install_createuser='1';
 $force_install_databaserootlogin='__SUPERUSERLOGIN__';
diff --git a/build/deb/postinst b/build/deb/postinst
index ca5fd1645dd..dd03156a6d2 100644
--- a/build/deb/postinst
+++ b/build/deb/postinst
@@ -24,31 +24,23 @@ db_version 2.0
 echo Run the dolibarr postinst script
 
 
-# Define vars
 docdir='/var/lib/dolibarr/documents'
 #docdir='/usr/share/dolibarr/documents'
-apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
-apacheconfig="/etc/dolibarr/apache.conf"
-installfileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
-installconfig="/etc/dolibarr/install.forced.php"
-#config="/usr/share/dolibarr/htdocs/conf/conf.php"
-config="/etc/dolibarr/conf.php"
+
 
 
 case "$1" in
 	configure)
 
-        # Create document directory for uploaded data files
-        mkdir -p $docdir
-        chown -R www-data:www-data $docdir
-        chmod -R 775 $docdir
-        chmod -R g+s $docdir
-
-		# Copy apache.conf file into target directory
+		# Copy apache.conf file into target directory.
+		#fileorig="/usr/share/dolibarr/build/deb/apache.conf"
+		#config="/etc/dolibarr/apache.conf"
 		#mkdir -p /etc/dolibarr
-		#cp -p $apachefileorig $apacheconfig
+		#cp -p $fileorig $config
 
-		# Copy install config file (with matching Debian) values into target directory
+		# Edit install.forced.php to match Debian values
+		fileorig="/usr/share/dolibarr/build/deb/install.forced.php.install"
+		config="/usr/share/dolibarr/htdocs/install/install.forced.php"
 		superuserlogin=''
 		superuserpassword=''
 		if [ -f /etc/mysql/debian.cnf ] ; then
@@ -58,24 +50,29 @@ case "$1" in
 		fi
 		echo Mysql superuser found to use is $superuserlogin
 		if [ -z "$superuserlogin" ] ; then
-			cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig
+			cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $config
 		else
-			cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig
+			cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
 		fi
-		chown -R root:www-data $installconfig
-	   	chmod -R 660 $installconfig
+
+        # Create document directory for uploaded data files
+        mkdir -p $docdir
+        chown -R www-data:www-data $docdir
+        chmod -R 775 $docdir
+        chmod -R g+s $docdir
 
 		# Create an empty conf.php with permission to web server
-		if [ ! -f $config ]
+		if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ]
 		then 
-			echo Create empty file $config		
-			touch $config
-			chown -R root:www-data $config
-	    	chmod -R 660 $config
+			echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php		
+			touch /usr/share/dolibarr/htdocs/conf/conf.php
+			chown -R root:www-data /usr/share/dolibarr/htdocs/conf/conf.php
+	    	chmod -R 660 /usr/share/dolibarr/htdocs/conf/conf.php
 		fi
 
-		# Get the web server type (use db_get for interactive mode).
 		#db_reset "dolibarr/webserver"
+
+		# Get the web server type (use db_get for interactive mode).
 		#db_get "dolibarr/webserver"		# Read value for webserver.
 		#webserver="$RET"
 
@@ -105,7 +102,7 @@ case "$1" in
 
 			# Set permissions to web server
 			chown -R $webuser:$webgroup /usr/share/dolibarr
-            chown -R root:$webgroup $config
+            chown -R root:$webgroup /usr/share/dolibarr/htdocs/conf/conf.php
 
 			# Add link to config file
             echo Setup web server $server to add dolibarr config file
@@ -113,6 +110,26 @@ case "$1" in
 			
 		done
 
+		#echo "Install menu entry"
+		# This one is for Gnome ubuntu
+		#fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"
+		#target="/usr/share/applications/"
+		#cp -f $fileorig $target
+		# Not sure this is usefull
+		#if test -x /usr/bin/update-menus; then 
+		#	echo "update-menus"
+		#	update-menus;
+		#fi
+		
+		# TODO Create the file to force parameters in Web installer
+		#if grep DBHOST /usr/share/dolibarr/htdocs/conf/conf.php > /dev/null
+		#then
+		#    perl -pi -e "s/DBHOST/$dbserver/" /usr/share/dolibarr/htdocs/conf/conf.php
+		#    perl -pi -e "s/DBNAME/$dbname/" /usr/share/dolibarr/htdocs/conf/conf.php
+		#    perl -pi -e "s/DBUSER/$dbuser/" /usr/share/dolibarr/htdocs/conf/conf.php
+		#    perl -pi -e "s/DBPASS/$dbpass/" /usr/share/dolibarr/htdocs/conf/conf.php
+		#fi
+
 		# Restart servers
 		servers="apache2-ssl apache2 mysql"
 		# Another way to restart
diff --git a/build/deb/postrm b/build/deb/postrm
index 9eae81b022b..8be194f0a41 100644
--- a/build/deb/postrm
+++ b/build/deb/postrm
@@ -26,11 +26,6 @@ echo Run the dolibarr postrm script
 
 docdir='/var/lib/dolibarr/documents'
 #docdir='/usr/share/dolibarr/documents'
-apachefileorig="/usr/share/dolibarr/build/deb/apache.conf"
-apacheconfig="/etc/dolibarr/apache.conf"
-#config="/usr/share/dolibarr/htdocs/conf/conf.php"
-config="/etc/dolibarr/conf.php"
-lockfile="/usr/share/dolibarr/install.lock"
 
 
 export webserver=""
@@ -41,38 +36,13 @@ case $webserver in
 	Both)		webservers="apache2 apache2-ssl" ;;
 	*)		    webservers="apache2 apache2-ssl" ;;
 esac
+export includefile=/etc/dolibarr/apache.conf
 
 
 case "$1" in
-
-    # Call when we upgrade
-	upgrade)
-	;;
-
-    # Call when we uninstall
-	remove)
-		rm -f $lockfile
-
-		# Remove include files
-		export restart=""
-		for server in $webservers ; do
-			export conffile="/etc/$server/conf.d/dolibarr.conf"
-            if [ -f $conffile ] ;
-            then
-               echo Delete link $conffile
-	           rm -f $conffile
-	           status=purge
-		    fi
-			
-			if [ "x$status" = "xpurge" ] ;
-				then restart="$restart $server"
-			fi
-		done
-	;;
-
     # Call when we uninstall and purge
 	purge)
-		echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig"
+		echo "postrm purge webservers=$webservers includefile=$includefile"
 
 		# Ask if we must delete database
 		echo "postrm db_input dolibarr/postrm"
@@ -89,8 +59,7 @@ case "$1" in
 			echo postrm Mysql database deletion
 			# Get database configuration
 			dbserver="localhost"
-			dbuser="dolibarrdebian"
-			dbname="dolibarrdebian"
+			dbname="dolibarrmysql"
 			#db_get "dolibarr/db/name"
 			#dbname="$RET"
 			superuserlogin=''
@@ -151,31 +120,23 @@ case "$1" in
 			fi
 			mysqlcmd="mysql $hostopt $passopt -u $dbadmin"
 
-		    # Now run the drop user
-			if eval $mysqlcmd -f -e "\"DROP USER '$dbuser'@'localhost';\"" ; then
-				echo Database login $dbuser removed
-			else
-			    error="Unable to run $mysqlcmd -f -e \"DROP USER '$dbuser'@'localhost';\""
-				echo $error
-			fi
-
 		    # Now run the drop commands
 		    if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
-				log="${log}Droping database $dbname."
-				if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
-				    if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
-					error="Database $dbname NOT successfully droped. You have to do it manually."
-					echo $error
-				    else
-					status=drop
-				    fi
-				else
-				    error="Unable to run the drop database script."
-					echo $error
-				fi
+			log="${log}Droping database $dbname."
+			if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
+			    if eval $mysqlcmd -f -e "\"show databases;\"" | grep -e "^$dbname" > /dev/null 2>&1 ; then
+				error="Database $dbname NOT successfully droped. You have to do it manually."
+				echo $error
+			    else
+				status=drop
+			    fi
+			else
+			    error="Unable to run the drop database script."
+				echo $error
+			fi
 		    else
-				status=nothing
-				log="${log}Database $dbname already not exists."
+			status=nothing
+			log="${log}Database $dbname already not exists."
 		    fi
 
 		    echo "Remove directory $docdir"
@@ -217,6 +178,18 @@ case "$1" in
     		set -e
 		done
 		
+		# Remove file and conf file
+		for dir in /usr/share/dolibarr; do
+			if [ -d $dir ] ; then 
+                # We disable blocking errors
+                set +e
+			    echo "Remove directory $dir"
+			    rm -rf $dir ; 
+                # We restore blocking errors
+                set -e
+			fi
+		done
+		
 		# We clean variable (we ignore errors because db_reset can fails if var was never set)
         set +e
 		db_reset "dolibarr/postrm"
@@ -225,6 +198,34 @@ case "$1" in
 		#db_purge
 	;;
 
+    # Call when we uninstall
+	remove)
+		echo "postrm Force remove of /usr/share/dolibarr/htdocs/install"
+		rm -fr /usr/share/dolibarr/htdocs/install
+
+        echo "postrm Force remove of /usr/share/dolibarr/htdocs/conf"
+        rm -fr /usr/share/dolibarr/htdocs/conf
+        
+		# Remove include files
+		export restart=""
+		for server in $webservers ; do
+			export conffile="/etc/$server/conf.d/dolibarr.conf"
+            if [ -f $conffile ] ;
+            then
+               echo Delete file $conffile
+	           rm -f $conffile
+	           status=purge
+		    fi
+			
+			if [ "x$status" = "xpurge" ] ;
+				then restart="$restart $server"
+			fi
+		done
+	;;
+
+	upgrade)
+	;;
+
 	failed-upgrade|abort-install|abort-upgrade|disappear)
 	;;
 
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index d3c47e6b28d..f191d88c7f9 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \version      $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $
+# \version      $Id: makepack-dolibarr.pl,v 1.121 2011/07/28 23:05:13 eldy Exp $
 # \author       (c)2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
 #----------------------------------------------------------------------------
 
@@ -11,7 +11,7 @@ use Cwd;
 $PROJECT="dolibarr";
 $MAJOR="3";
 $MINOR="1";
-$BUILD="0-beta";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$BUILD="0-dev";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
 $RPMSUBVERSION="auto";	# auto use value found into BUILD
 
 @LISTETARGET=("TGZ","ZIP","RPM","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
@@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
 
 
 use vars qw/ $REVISION $VERSION /;
-$REVISION='$Revision: 1.128 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
+$REVISION='$Revision: 1.121 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.0 (build $REVISION)";
 
 
@@ -254,18 +254,15 @@ if ($nboftargetok) {
 
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliW*-*`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/DoliM*-*`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.changes`;
+        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.deb`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.dsc`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr_*.tar.gz`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.deb`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.rpm`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tar.gz`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.tgz`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/dolibarr-*.zip`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/build/doxygen/doxygen_warnings.log`;
-	    $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
@@ -276,10 +273,6 @@ if ($nboftargetok) {
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/fckeditor.py`;
 	    
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mysql/README`;
-        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`;
-
         $ret=`rm -fr $BUILDROOT/$PROJECT/dev/test`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/dev/spec`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/dev/licence`;
@@ -298,6 +291,11 @@ if ($nboftargetok) {
         $ret=`rm -f  $BUILDROOT/$PROJECT/doc/images/dolibarr_screenshot12.png`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/documents`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/document`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
+	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/custom2`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/bureau2crea`;
@@ -308,7 +306,6 @@ if ($nboftargetok) {
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`;
         $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`;
-        $ret=`rm -fr  $BUILDROOT/$PROJECT/htdocs/includes/smarty`;
 	    #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`;
 	    #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`;
         #$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`;
@@ -416,19 +413,14 @@ if ($nboftargetok) {
     	}
     
     	if ($target eq 'RPM') {                 # Linux only
-    		#$ARCH='i386';
-    		$ARCH='noarch';
+    		$ARCH='i386';
 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
            	$newbuild = $BUILD;
-           	# For fedora
-            $newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev
-            $newbuild =~ s/beta/0.2.beta1/gi;				# beta
-            $newbuild =~ s/rc./0.3.rc1/gi;					# rc
+            $newbuild =~ s/(dev|alpha)/0/gi;				# dev
+            $newbuild =~ s/beta/1/gi;						# beta
+            $newbuild =~ s/rc./2/gi;						# rc
             if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
-            #$newbuild =~ s/(dev|alpha)/0/gi;				# dev
-            #$newbuild =~ s/beta/1/gi;						# beta
-            #$newbuild =~ s/rc./2/gi;						# rc
-            #if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
+            # now newbuild is 0-0 or 0-3 for example
             $REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
             if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
             print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
@@ -446,93 +438,16 @@ if ($nboftargetok) {
 
  			print "Remove other files\n";
             $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
 
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
-            # To remove once stable
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
-
-			# Apache conf files
-    		#print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`;
-    		#$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`;
-
-			# Dolibarr conf files
-			# TODO
-
-			# dolibarr.desktop
-	   		#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`;
-    		#print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n";
-    		#$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`;
-            
-            # pixmap
-	   		#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`;
-    		#print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n";
-    		#$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`;
-
-			# Set owners
-            print "Set owners on files/dir\n";
-		    $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`;
-
-            print "Set permissions on files/dir\n";
-		    $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
-		    $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-
-			# Build tgz
     		print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
     		$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;
 
@@ -560,10 +475,6 @@ if ($nboftargetok) {
    		    print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\n";
    		    $cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
     		$ret=`$cmd`;
-   		    print "Move $RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm into $DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\n";
-   		    $cmd="mv \"$RPMDIR/SRPMS/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\" \"$DESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm\"";
-    		$ret=`$cmd`;
-
     		next;
     	}
     	
@@ -614,33 +525,20 @@ if ($nboftargetok) {
             print "Version set to $MAJOR.$MINOR.$newbuild\n";
             
  			print "Remove other files\n";
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/README-FR`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/aps`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/dmg`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/pad/README`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/tgz/README`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README`;
-            #$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb`;
             $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/po`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/changelog`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/compat`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/config`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/control.*`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/copyright`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.desktop`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/dolibarr.menu`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/format`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/install`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/menu`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postrm`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/postinst`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/rules`;
-            $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/README.debian`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/templates.futur`;
             $ret=`rm -f  $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/build/deb/wash`;
@@ -700,7 +598,17 @@ if ($nboftargetok) {
             print "Create directory $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT\n";
             $ret=`mkdir -p "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT"`;
             
-			# Set owners
+    		#print "Copy README file into $BUILDROOT/$PROJECT.tmp/DEBIAN\n";
+            #$ret=`cp "$SOURCE/README" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/README"`;
+
+			# copyright (to build binary package directly without sources. Useless if we build from sources)
+    		#print "Copy copyright file into $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright\n";
+            #$ret=`cp "$SOURCE/build/deb/copyright" "$BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/copyright"`;
+
+            # changelog (to build binary package directly without sources. Useless if we build from sources)
+            #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.Debian.gz`;
+            #$ret=`gzip -9 -c "$SOURCE/build/deb/changelog" > $BUILDROOT/$PROJECT.tmp/usr/share/doc/$PROJECT/changelog.gz`;
+
             print "Set owners on files/dir\n";
 		    $ret=`chown -R root.root $BUILDROOT/$PROJECT.tmp`;
 
@@ -744,25 +652,29 @@ if ($nboftargetok) {
             $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian"`;
             $ret=`mkdir "$BUILDROOT/$PROJECT.tmp/debian/source"`;
             $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/pom.xml"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYRIGHT"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/INSTALL"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README"`;
+            $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/README-FR"`;
             $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc"`;
             print "Copy $SOURCE/build/deb/xxx to $BUILDROOT/$PROJECT.tmp/debian\n";
             # Add files for dpkg-source
-            $ret=`cp -f  "$SOURCE/ChangeLog"                "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
-            $ret=`cp -f  "$SOURCE/build/deb/README.debian"  "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
-            $ret=`cp -f  "$SOURCE/build/deb/changelog"      "$BUILDROOT/$PROJECT.tmp/debian/changelog"`;
-            $ret=`cp -f  "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
-            $ret=`cp -f  "$SOURCE/build/deb/install"        "$BUILDROOT/$PROJECT.tmp/debian/install"`;
-            $ret=`cp -f  "$SOURCE/build/deb/rules"          "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
-            $ret=`cp -f  "$SOURCE/build/deb/copyright"      "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
-            $ret=`cp -f  "$SOURCE/build/deb/compat"         "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
-            $ret=`cp -f  "$SOURCE/build/deb/format"         "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
-            $ret=`cp -fr "$SOURCE/build/deb/po"             "$BUILDROOT/$PROJECT.tmp/debian/po"`;
-			$ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/debian/po/CVS"`;
+            $ret=`cp -f "$SOURCE/ChangeLog"                "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/UserChangeLog"`;
+            $ret=`cp -f "$SOURCE/build/deb/README.debian"  "$BUILDROOT/$PROJECT.tmp/usr/share/doc/dolibarr/README"`;
+            $ret=`cp -f "$SOURCE/build/deb/changelog"      "$BUILDROOT/$PROJECT.tmp/debian/changelog"`;
+            $ret=`cp -f "$SOURCE/build/deb/control.debian" "$BUILDROOT/$PROJECT.tmp/debian/control"`;
+            $ret=`cp -f "$SOURCE/build/deb/install"        "$BUILDROOT/$PROJECT.tmp/debian/install"`;
+            $ret=`cp -f "$SOURCE/build/deb/rules"          "$BUILDROOT/$PROJECT.tmp/debian/rules"`;
+            $ret=`cp -f "$SOURCE/build/deb/copyright"      "$BUILDROOT/$PROJECT.tmp/debian/copyright"`;
+            $ret=`cp -f "$SOURCE/build/deb/compat"         "$BUILDROOT/$PROJECT.tmp/debian/compat"`;
+            $ret=`cp -f "$SOURCE/build/deb/format"         "$BUILDROOT/$PROJECT.tmp/debian/source/format"`;
+            $ret=`cp -fr "$SOURCE/build/deb/po"            "$BUILDROOT/$PROJECT.tmp/debian/po"`;
             # Add files also required to build binary package with dpkg-buildpackages
-            $ret=`cp -f  "$SOURCE/build/deb/config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/deb/postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/deb/postrm"         "$BUILDROOT/$PROJECT.tmp/debian"`;
-            $ret=`cp -f  "$SOURCE/build/deb/templates"      "$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`cp -f "$SOURCE/build/deb/config"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`cp -f "$SOURCE/build/deb/postinst"       "$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`cp -f "$SOURCE/build/deb/postrm"         "$BUILDROOT/$PROJECT.tmp/debian"`;
+            $ret=`cp -f "$SOURCE/build/deb/templates"      "$BUILDROOT/$PROJECT.tmp/debian"`;
             
             $cmd="mv $BUILDROOT/$PROJECT.tmp $BUILDROOT/$PROJECT-$MAJOR.$MINOR.$build";
             $ret=`$cmd`;
@@ -778,18 +690,12 @@ if ($nboftargetok) {
             if ($OS =~ /windows/i)
             {
                 print "Move *_all.deb to $DESTI\n";
-                $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
+                $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
             }
             else
             {
                 print "Move *_all.deb to $DESTI\n";
-                $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
+                $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
             }
         	next;
         }
diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop
index 4b4fb60dadb..33fadf7624f 100755
--- a/build/rpm/dolibarr.desktop
+++ b/build/rpm/dolibarr.desktop
@@ -19,7 +19,7 @@ Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr
 Terminal=false
 Type=Application
-Categories=Office;
+Categories=Office
 StartupNotify=true
 InitialPreference=5
 #NoDisplay=true
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index 2c284c5cae8..f02e3d6203a 100755
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *   	\file       htdocs/admin/proxy.php
  *      \ingroup    core
  *		\brief      Page  setup proxy to use for external web access
- *		\version    $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $
+ *		\version    $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg);
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $');
+llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $');
 ?>
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index c1d629f7b7b..c0aaaa86213 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/admin/security_other.php
  *      \ingroup    core
  *      \brief      Security options setup
- *		\version    $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $
+ *		\version    $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs-
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $');
+llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $');
 ?>
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index 838a3ce7b97..d2d54e4a8b2 100644
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *  \file       htdocs/admin/system/index.php
  *  \brief      Home page of system information
- *  \version    $Id: index.php,v 1.49 2011/07/31 22:23:14 eldy Exp $
+ *  \version    $Id: index.php,v 1.48 2011/07/27 23:50:52 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -126,5 +127,5 @@ print '<br>';
 print info_admin($langs->trans("SystemInfoDesc")).'<br>';
 
 
-llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $');
+llxFooter('$Date: 2011/07/27 23:50:52 $ - $Revision: 1.48 $');
 ?>
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 1afc2d54b02..0d679c15b84 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 require('../main.inc.php');
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 28e45b28595..05e52bded62 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -16,14 +16,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *  \file       htdocs/comm/action/index.php
  *  \ingroup    agenda
  *  \brief      Home page of calendar events
- *  \version    $Id: index.php,v 1.184 2011/07/31 22:23:20 eldy Exp $
+ *  \version    $Id: index.php,v 1.183 2011/07/22 06:51:31 simnandez Exp $
  */
 
 require("../../main.inc.php");
@@ -785,7 +786,7 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format
 ';
 */
 
-llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.184 $');
+llxFooter('$Date: 2011/07/22 06:51:31 $ - $Revision: 1.183 $');
 
 
 /**
diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php
index 0c262ba2936..5ba2ef8997e 100644
--- a/htdocs/compta/bank/bankid_fr.php
+++ b/htdocs/compta/bank/bankid_fr.php
@@ -15,14 +15,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *  \file       htdocs/compta/bank/bankid_fr.php
  *  \ingroup    banque
  *  \brief      Fiche creation compte bancaire
- *  \version    $Id: bankid_fr.php,v 1.28 2011/07/31 22:23:20 eldy Exp $
+ *  \version    $Id: bankid_fr.php,v 1.27 2011/07/29 20:47:35 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -385,5 +386,5 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:20 $ - $Revision: 1.28 $');
+llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.27 $');
 ?>
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index 525160df9ef..9ee1f551048 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -15,14 +15,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/compta/bank/fiche.php
  *      \ingroup    banque
  *		\brief      Page to create/view a bank account
- *		\version    $Id: fiche.php,v 1.78 2011/07/31 22:23:16 eldy Exp $
+ *		\version    $Id: fiche.php,v 1.77 2011/07/29 20:47:35 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -607,5 +608,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.78 $');
+llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.77 $');
 ?>
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index f44ccfb4894..cfe6b3e7cdc 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *       \file       htdocs/compta/bank/rappro.php
  *       \ingroup    banque
  *       \brief      Page to reconciliate bank transactions
- *       \version    $Id: rappro.php,v 1.68 2011/07/31 22:23:16 eldy Exp $
+ *       \version    $Id: rappro.php,v 1.67 2011/07/26 23:16:47 eldy Exp $
  */
 
 require("./pre.inc.php");
@@ -402,5 +403,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:16 $ - $Revision: 1.68 $');
+llxFooter('$Date: 2011/07/26 23:16:47 $ - $Revision: 1.67 $');
 ?>
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 3148174f5af..c7e0858fe09 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -20,14 +20,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/filefunc.inc.php
  * 	\ingroup	core
  *  \brief      File that include conf.php file and functions.lib.php
- *  \version    $Id: filefunc.inc.php,v 1.21 2011/07/31 23:19:04 eldy Exp $
+ *  \version    $Id: filefunc.inc.php,v 1.19 2011/07/21 22:11:30 eldy Exp $
  */
 
 define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -60,17 +61,8 @@ error_reporting(E_ALL ^ E_NOTICE);
 //error_reporting(E_ALL);
 
 
-$conffiletoshowshort = "conf.php";
-# Define localization of conf file
-$conffile = "conf/conf.php";
-$conffiletoshow = "htdocs/conf/conf.php";
-# For debian/redhat like systems
-#$conffile = "/etc/dolibarr/conf.php";
-#$conffiletoshow = "/etc/dolibarr/conf.php";
-
-
 // Include configuration
-$result=@include_once($conffile);
+$result=@include_once("conf/conf.php");
 if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done and we are in a web session
 {
 	header("Location: install/index.php");
diff --git a/htdocs/includes/barcode/html.formbarcode.class.php b/htdocs/includes/barcode/html.formbarcode.class.php
index 2424ec2a803..253664281d9 100644
--- a/htdocs/includes/barcode/html.formbarcode.class.php
+++ b/htdocs/includes/barcode/html.formbarcode.class.php
@@ -13,15 +13,16 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: html.formbarcode.class.php,v 1.16 2011/07/31 23:29:11 eldy Exp $
+ * $Id$
  */
 
 /**
         \file       htdocs/includes/barcode/html.formbarcode.class.php
         \brief      Fichier de la classe des fonctions predefinie de composants html
-        \version    $Revision: 1.16 $
+        \version    $Revision$
 */
 
 
diff --git a/htdocs/includes/boxes/box_actions.php b/htdocs/includes/boxes/box_actions.php
index 68bf4bc1f6d..c09d95ecf16 100644
--- a/htdocs/includes/boxes/box_actions.php
+++ b/htdocs/includes/boxes/box_actions.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_actions.php
  *	\ingroup    actions
  *	\brief      Module to build boxe for events
- *	\version	$Id: box_actions.php,v 1.49 2011/07/31 23:29:09 eldy Exp $
+ *	\version	$Id: box_actions.php,v 1.48 2011/07/03 12:55:33 eldy Exp $
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_bookmarks.php b/htdocs/includes/boxes/box_bookmarks.php
index 241398d8ad1..17e823e6dd1 100644
--- a/htdocs/includes/boxes/box_bookmarks.php
+++ b/htdocs/includes/boxes/box_bookmarks.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/includes/boxes/box_bookmarks.php
  *      \ingroup    bookmark
  *      \brief      Module to generate box of bookmarks list
- *		\version	$Id: box_bookmarks.php,v 1.18 2011/07/31 23:29:10 eldy Exp $
+ *		\version	$Id$
  */
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
 
diff --git a/htdocs/includes/boxes/box_clients.php b/htdocs/includes/boxes/box_clients.php
index 6ea6b3fa93a..21da64ebff1 100644
--- a/htdocs/includes/boxes/box_clients.php
+++ b/htdocs/includes/boxes/box_clients.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_clients.php
  *	\ingroup    societes
  *	\brief      Module de generation de l'affichage de la box clients
- *	\version	$Id: box_clients.php,v 1.40 2011/07/31 23:29:09 eldy Exp $
+ *	\version	$Id$
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_commandes.php b/htdocs/includes/boxes/box_commandes.php
index d6dd903d62b..895bf51c96c 100644
--- a/htdocs/includes/boxes/box_commandes.php
+++ b/htdocs/includes/boxes/box_commandes.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\file       htdocs/includes/boxes/box_commandes.php
  *		\ingroup    commande
  *		\brief      Module de generation de l'affichage de la box commandes
- *		\version	$Id: box_commandes.php,v 1.33 2011/07/31 23:29:10 eldy Exp $
+ *		\version	$Id$
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_comptes.php b/htdocs/includes/boxes/box_comptes.php
index b0f12333f7c..8f4638748e8 100644
--- a/htdocs/includes/boxes/box_comptes.php
+++ b/htdocs/includes/boxes/box_comptes.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/includes/boxes/box_comptes.php
  *      \ingroup    banque
  *      \brief      Module to generate box for bank accounts
- *		\version	$Id: box_comptes.php,v 1.21 2011/07/31 23:29:09 eldy Exp $
+ *		\version	$Id$
  */
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
 include_once(DOL_DOCUMENT_ROOT."/compta/bank/class/account.class.php");
diff --git a/htdocs/includes/boxes/box_contacts.php b/htdocs/includes/boxes/box_contacts.php
index 1a053bc8b04..bc2a072ee1d 100755
--- a/htdocs/includes/boxes/box_contacts.php
+++ b/htdocs/includes/boxes/box_contacts.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_contacts.php
  *	\ingroup    societes
  *	\brief      Module to show box of contacts
- *	\version	$Id: box_contacts.php,v 1.3 2011/07/31 23:29:10 eldy Exp $
+ *	\version	$Id$
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_contracts.php b/htdocs/includes/boxes/box_contracts.php
index 10c61eca9c7..8f92bac5704 100644
--- a/htdocs/includes/boxes/box_contracts.php
+++ b/htdocs/includes/boxes/box_contracts.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  * 		\file       htdocs/includes/boxes/box_contracts.php
  * 		\ingroup    contracts
  * 		\brief      Module de generation de l'affichage de la box contracts
- * 		\version	$Id: box_contracts.php,v 1.10 2011/07/31 23:29:10 eldy Exp $
+ * 		\version	$Id$
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_external_rss.php b/htdocs/includes/boxes/box_external_rss.php
index 0859f336cb4..b41c4b8ec3d 100644
--- a/htdocs/includes/boxes/box_external_rss.php
+++ b/htdocs/includes/boxes/box_external_rss.php
@@ -15,14 +15,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  * 	    \file       htdocs/includes/boxes/box_external_rss.php
  *      \ingroup    external_rss
  *      \brief      Fichier de gestion d'une box pour le module external_rss
- *      \version    $Id: box_external_rss.php,v 1.34 2011/07/31 23:29:10 eldy Exp $
+ *      \version    $Id$
  */
 
 include_once(MAGPIERSS_PATH."rss_fetch.inc");
diff --git a/htdocs/includes/boxes/box_factures.php b/htdocs/includes/boxes/box_factures.php
index f81d4421282..7adc61d5729 100644
--- a/htdocs/includes/boxes/box_factures.php
+++ b/htdocs/includes/boxes/box_factures.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_factures.php
  *	\ingroup    factures
  *	\brief      Module de generation de l'affichage de la box factures
- *	\version	$Id: box_factures.php,v 1.52 2011/07/31 23:29:09 eldy Exp $
+ *	\version	$Id$
  */
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
 
diff --git a/htdocs/includes/boxes/box_factures_fourn.php b/htdocs/includes/boxes/box_factures_fourn.php
index e086035ea9e..2fe7ba95c0b 100644
--- a/htdocs/includes/boxes/box_factures_fourn.php
+++ b/htdocs/includes/boxes/box_factures_fourn.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/includes/boxes/box_factures_fourn.php
  *      \ingroup    supplier
  *		\brief      Fichier de gestion d'une box des factures fournisseurs
- *		\version    $Id: box_factures_fourn.php,v 1.36 2011/07/31 23:29:10 eldy Exp $
+ *		\version    $Id$
  */
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
 
diff --git a/htdocs/includes/boxes/box_factures_fourn_imp.php b/htdocs/includes/boxes/box_factures_fourn_imp.php
index 8a04eae534d..2482944c9fa 100644
--- a/htdocs/includes/boxes/box_factures_fourn_imp.php
+++ b/htdocs/includes/boxes/box_factures_fourn_imp.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/includes/boxes/box_factures_fourn_imp.php
  *      \ingroup    fournisseur
  *		\brief      Fichier de gestion d'une box des factures fournisseurs impayees
- *		\version    $Id: box_factures_fourn_imp.php,v 1.37 2011/07/31 23:29:10 eldy Exp $
+ *		\version    $Id$
  */
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
 
diff --git a/htdocs/includes/boxes/box_factures_imp.php b/htdocs/includes/boxes/box_factures_imp.php
index efc0e8a8e67..f4a1818e45d 100644
--- a/htdocs/includes/boxes/box_factures_imp.php
+++ b/htdocs/includes/boxes/box_factures_imp.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_factures_imp.php
  *	\ingroup    factures
  *	\brief      Module de generation de l'affichage de la box factures impayees
- *	\version	$Id: box_factures_imp.php,v 1.54 2011/07/31 23:29:10 eldy Exp $
+ *	\version	$Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_fournisseurs.php b/htdocs/includes/boxes/box_fournisseurs.php
index 36b00b5ea90..7dda9b9f14d 100644
--- a/htdocs/includes/boxes/box_fournisseurs.php
+++ b/htdocs/includes/boxes/box_fournisseurs.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
     \file       htdocs/includes/boxes/box_fournisseurs.php
     \ingroup    fournisseurs
     \brief      Module to generate box of suppliers
-	\version	$Id: box_fournisseurs.php,v 1.30 2011/07/31 23:29:10 eldy Exp $
+	\version	$Id$
 */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_members.php b/htdocs/includes/boxes/box_members.php
index d6daac28e8c..7d0c80c916b 100755
--- a/htdocs/includes/boxes/box_members.php
+++ b/htdocs/includes/boxes/box_members.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_members.php
  *	\ingroup    societes
  *	\brief      Module de generation de l'affichage de la box clients
- *	\version	$Id: box_members.php,v 1.4 2011/07/31 23:29:09 eldy Exp $
+ *	\version	$Id$
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_osc_client.php b/htdocs/includes/boxes/box_osc_client.php
index 362a070865f..60e210697c3 100644
--- a/htdocs/includes/boxes/box_osc_client.php
+++ b/htdocs/includes/boxes/box_osc_client.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
     \file       htdocs/includes/boxes/box_osc_client.php
     \ingroup    osc
     \brief      Module to generate box of shop customers
-	\version	$Id: box_osc_client.php,v 1.17 2011/07/31 23:29:10 eldy Exp $
+	\version	$Id$
 */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_produits.php b/htdocs/includes/boxes/box_produits.php
index 9287c9bb20b..560053eb8f1 100644
--- a/htdocs/includes/boxes/box_produits.php
+++ b/htdocs/includes/boxes/box_produits.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/includes/boxes/box_produits.php
  *	\ingroup    produits,services
  *	\brief      Module to generate box of last products/services
- *	\version	$Id: box_produits.php,v 1.41 2011/07/31 23:29:10 eldy Exp $
+ *	\version	$Id$
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_propales.php b/htdocs/includes/boxes/box_propales.php
index f384997e797..12c8f7580e6 100644
--- a/htdocs/includes/boxes/box_propales.php
+++ b/htdocs/includes/boxes/box_propales.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
 		\file       htdocs/includes/boxes/box_propales.php
 		\ingroup    propales
 		\brief      Module de generation de l'affichage de la box propales
-		\version	$Id: box_propales.php,v 1.47 2011/07/31 23:29:10 eldy Exp $
+		\version	$Id$
 */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/box_prospect.php b/htdocs/includes/boxes/box_prospect.php
index 07ceb0b7ec7..a3fcd9847fa 100644
--- a/htdocs/includes/boxes/box_prospect.php
+++ b/htdocs/includes/boxes/box_prospect.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *   \file       htdocs/includes/boxes/box_prospect.php
  *   \ingroup    societe
  *   \brief      Module to generate the last prospects box.
- *	\version	$Id: box_prospect.php,v 1.43 2011/07/31 23:29:10 eldy Exp $
+ *	\version	$Id$
  */
 
 
diff --git a/htdocs/includes/boxes/box_services_vendus.php b/htdocs/includes/boxes/box_services_vendus.php
index c9caa3b3516..34e35392858 100644
--- a/htdocs/includes/boxes/box_services_vendus.php
+++ b/htdocs/includes/boxes/box_services_vendus.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/includes/boxes/box_services_vendus.php
  *		\ingroup    produits,services
  *      \brief      Module de generation de l'affichage de la box services_vendus
- *		\version	$Id: box_services_vendus.php,v 1.54 2011/07/31 23:29:09 eldy Exp $
+ *		\version	$Id$
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/boxes/modules_boxes.php");
diff --git a/htdocs/includes/boxes/modules_boxes.php b/htdocs/includes/boxes/modules_boxes.php
index 5a7dafa719c..e13affbe9ec 100644
--- a/htdocs/includes/boxes/modules_boxes.php
+++ b/htdocs/includes/boxes/modules_boxes.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *	    \file       htdocs/includes/boxes/modules_boxes.php
  *		\ingroup    facture
  *		\brief      Fichier contenant la classe mere des boites
- *		\version    $Id: modules_boxes.php,v 1.56 2011/07/31 23:29:10 eldy Exp $
+ *		\version    $Id: modules_boxes.php,v 1.55 2011/07/20 19:03:35 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/login/functions_dolibarr.php b/htdocs/includes/login/functions_dolibarr.php
index 6e086409c3d..f15204c6afb 100644
--- a/htdocs/includes/login/functions_dolibarr.php
+++ b/htdocs/includes/login/functions_dolibarr.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/includes/login/functions_dolibarr.php
  *      \ingroup    core
  *      \brief      Authentication functions for Dolibarr mode
- *		\version	$Id: functions_dolibarr.php,v 1.13 2011/07/31 23:29:11 eldy Exp $
+ *		\version	$Id$
  */
 
 
diff --git a/htdocs/includes/login/functions_empty.php b/htdocs/includes/login/functions_empty.php
index c3ab605c80c..0539aa72c92 100644
--- a/htdocs/includes/login/functions_empty.php
+++ b/htdocs/includes/login/functions_empty.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/includes/login/functions_empty.php
  *      \ingroup    core
  *      \brief      Empty authentication functions for test
- *		\version	$Id: functions_empty.php,v 1.2 2011/07/31 23:29:10 eldy Exp $
+ *		\version	$Id$
  */
 
 
diff --git a/htdocs/includes/login/functions_forceuser.php b/htdocs/includes/login/functions_forceuser.php
index 0aa66999b96..de4d4fc1a7f 100644
--- a/htdocs/includes/login/functions_forceuser.php
+++ b/htdocs/includes/login/functions_forceuser.php
@@ -12,9 +12,10 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: functions_forceuser.php,v 1.4 2011/07/31 23:29:11 eldy Exp $
+ * $Id$
  */
 
 /**
diff --git a/htdocs/includes/login/functions_http.php b/htdocs/includes/login/functions_http.php
index 09ff60a301a..b6facb72289 100644
--- a/htdocs/includes/login/functions_http.php
+++ b/htdocs/includes/login/functions_http.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
         \file       htdocs/includes/login/functions_http.php
         \ingroup    core
         \brief      Authentication functions for HTTP Basic
-		\version	$Id: functions_http.php,v 1.4 2011/07/31 23:29:11 eldy Exp $
+		\version	$Id$
 */
 
 
diff --git a/htdocs/includes/login/functions_ldap.php b/htdocs/includes/login/functions_ldap.php
index 3b330afdb2f..e7f0359ced4 100644
--- a/htdocs/includes/login/functions_ldap.php
+++ b/htdocs/includes/login/functions_ldap.php
@@ -12,9 +12,10 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: functions_ldap.php,v 1.18 2011/07/31 23:29:11 eldy Exp $
+ * $Id$
  */
 
 /**
diff --git a/htdocs/includes/login/functions_myopenid.php b/htdocs/includes/login/functions_myopenid.php
index b54f46cb1bc..e1a67e82403 100644
--- a/htdocs/includes/login/functions_myopenid.php
+++ b/htdocs/includes/login/functions_myopenid.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/includes/login/functions_dolibarr.php
  *      \ingroup    core
  *      \brief      Authentication functions for Dolibarr mode
- *		\version	$Id: functions_myopenid.php,v 1.4 2011/07/31 23:29:11 eldy Exp $
+ *		\version	$Id$
  */
 
 
diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index 5ed88b641a6..e884e791d8f 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -17,13 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *  \file           htdocs/includes/modules/DolibarrModules.class.php
  *  \brief          Fichier de description et activation des modules Dolibarr
- *  \version        $Id: DolibarrModules.class.php,v 1.163 2011/07/31 23:28:12 eldy Exp $
+ *  \version        $Id: DolibarrModules.class.php,v 1.162 2011/07/17 18:13:44 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/modules/action/rapport.pdf.php b/htdocs/includes/modules/action/rapport.pdf.php
index 9fafd03df67..e7e4eac9505 100644
--- a/htdocs/includes/modules/action/rapport.pdf.php
+++ b/htdocs/includes/modules/action/rapport.pdf.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *	\file       htdocs/includes/modules/action/rapport.pdf.php
  *	\ingroup    commercial
  *	\brief      File to build PDF with events
- *	\version    $Id: rapport.pdf.php,v 1.35 2011/07/31 23:28:17 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
diff --git a/htdocs/includes/modules/barcode/modules_barcode.php b/htdocs/includes/modules/barcode/modules_barcode.php
index d3ebaa07d55..cf5df713d1a 100644
--- a/htdocs/includes/modules/barcode/modules_barcode.php
+++ b/htdocs/includes/modules/barcode/modules_barcode.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *   \file       htdocs/includes/modules/barcode/modules_barcode.php
  *   \ingroup    barcode
  *   \brief      Fichier contenant la classe mere de generation des codes barres
- *   \version    $Id: modules_barcode.php,v 1.5 2011/07/31 23:28:17 eldy Exp $
+ *   \version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
 
diff --git a/htdocs/includes/modules/barcode/phpbarcode.modules.php b/htdocs/includes/modules/barcode/phpbarcode.modules.php
index 11c1e46cc56..6ad4c946de8 100644
--- a/htdocs/includes/modules/barcode/phpbarcode.modules.php
+++ b/htdocs/includes/modules/barcode/phpbarcode.modules.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\file       htdocs/includes/modules/barcode/phpbarcode.modules.php
  *	\ingroup    facture
  *	\brief      Fichier contenant la classe du modele de generation code barre phpbarcode
- *	\version    $Id: phpbarcode.modules.php,v 1.14 2011/07/31 23:28:17 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/barcode/modules_barcode.php");
diff --git a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php b/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php
index 6f552b8679e..1d6eab22970 100644
--- a/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php
+++ b/htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *	\file       htdocs/includes/modules/cheque/pdf/modules_chequereceipts.php
  *	\ingroup    facture
  *	\brief      File with parent class of check receipt document generators
- *	\version    $Id: modules_chequereceipts.php,v 1.5 2011/07/31 23:28:16 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
index e95374717d6..a4dd732c428 100644
--- a/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
+++ b/htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\file       htdocs/includes/modules/cheque/pdf/pdf_blochet.class.php
  *	\ingroup    banque
  *	\brief      File to build cheque deposit receipts
- *	\version    $Id: pdf_blochet.class.php,v 1.41 2011/07/31 23:28:16 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/commande/mod_commande_marbre.php b/htdocs/includes/modules/commande/mod_commande_marbre.php
index 2c1c30d9857..70cd49b0b3c 100644
--- a/htdocs/includes/modules/commande/mod_commande_marbre.php
+++ b/htdocs/includes/modules/commande/mod_commande_marbre.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *  \file       htdocs/includes/modules/commande/mod_commande_marbre.php
  *  \ingroup    commande
  *  \brief      File of class to manage customer order numbering rules Marbre
- *  \version    $Id: mod_commande_marbre.php,v 1.23 2011/07/31 23:28:13 eldy Exp $
+ *  \version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php");
 
diff --git a/htdocs/includes/modules/commande/mod_commande_saphir.php b/htdocs/includes/modules/commande/mod_commande_saphir.php
index 27499d13d3c..fd42edd4366 100644
--- a/htdocs/includes/modules/commande/mod_commande_saphir.php
+++ b/htdocs/includes/modules/commande/mod_commande_saphir.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
 	\file       htdocs/includes/modules/commande/mod_commande_saphir.php
 	\ingroup    commande
 	\brief      Fichier contenant la classe du modele de numerotation de reference de commande Saphir
-	\version    $Id: mod_commande_saphir.php,v 1.26 2011/07/31 23:28:13 eldy Exp $
+	\version    $Id$
 */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php");
diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php
index ce72e32e5ca..0a10adcd852 100644
--- a/htdocs/includes/modules/commande/modules_commande.php
+++ b/htdocs/includes/modules/commande/modules_commande.php
@@ -16,7 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -25,7 +26,7 @@
  *  \ingroup		commande
  *  \brief			Fichier contenant la classe mere de generation des commandes en PDF
  *  				et la classe mere de numerotation des commandes
- *  \version    	$Id: modules_commande.php,v 1.48 2011/07/31 23:28:13 eldy Exp $
+ *  \version    	$Id: modules_commande.php,v 1.47 2011/07/04 10:35:49 hregis Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php
index 019231e34c5..ed5406a52e4 100644
--- a/htdocs/includes/modules/commande/pdf_edison.modules.php
+++ b/htdocs/includes/modules/commande/pdf_edison.modules.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *	\file       htdocs/includes/modules/commande/pdf_edison.modules.php
  *	\ingroup    commande
  *	\brief      Fichier de la classe permettant de generer les commandes au modele Edison
- *	\version    $Id: pdf_edison.modules.php,v 1.89 2011/07/31 23:28:13 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php");
diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php
index 316e66a000a..adb3da49612 100644
--- a/htdocs/includes/modules/commande/pdf_einstein.modules.php
+++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +25,7 @@
  *	\ingroup    commande
  *	\brief      Fichier de la classe permettant de generer les commandes au modele Einstein
  *	\author	    Laurent Destailleur
- *	\version    $Id: pdf_einstein.modules.php,v 1.163 2011/07/31 23:28:13 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/commande/modules_commande.php");
diff --git a/htdocs/includes/modules/contract/mod_contract_magre.php b/htdocs/includes/modules/contract/mod_contract_magre.php
index e510478a966..ff403f351a5 100755
--- a/htdocs/includes/modules/contract/mod_contract_magre.php
+++ b/htdocs/includes/modules/contract/mod_contract_magre.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *  \file       htdocs/includes/modules/contract/mod_contract_magre.php
  *  \ingroup    contract
  *  \brief      File of class to manage contract numbering rules Magre
- *  \version    $Id: mod_contract_magre.php,v 1.3 2011/07/31 23:28:16 eldy Exp $
+ *  \version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/contract/modules_contract.php");
diff --git a/htdocs/includes/modules/contract/mod_contract_serpis.php b/htdocs/includes/modules/contract/mod_contract_serpis.php
index 26c092a82ce..e537971ec3c 100755
--- a/htdocs/includes/modules/contract/mod_contract_serpis.php
+++ b/htdocs/includes/modules/contract/mod_contract_serpis.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *  \file       htdocs/includes/modules/contract/mod_contract_serpis.php
  *  \ingroup    contract
  *  \brief      File of class to manage contract numbering rules Serpis
- *  \version    $Id: mod_contract_serpis.php,v 1.2 2011/07/31 23:28:17 eldy Exp $
+ *  \version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/contract/modules_contract.php");
 
diff --git a/htdocs/includes/modules/contract/modules_contract.php b/htdocs/includes/modules/contract/modules_contract.php
index dd1c8a51d99..977df36c77a 100755
--- a/htdocs/includes/modules/contract/modules_contract.php
+++ b/htdocs/includes/modules/contract/modules_contract.php
@@ -17,7 +17,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -25,7 +26,7 @@
  *  \file       htdocs/includes/modules/contract/modules_contract.php
  *  \ingroup    contract
  *  \brief      File of class to manage contract numbering
- *  \version    $Id: modules_contract.php,v 1.3 2011/07/31 23:28:16 eldy Exp $
+ *  \version    $Id$
  */
 
 class ModelNumRefContracts
diff --git a/htdocs/includes/modules/dons/html_cerfafr.modules.php b/htdocs/includes/modules/dons/html_cerfafr.modules.php
index a3e88d7517c..95ebe53aa84 100644
--- a/htdocs/includes/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/includes/modules/dons/html_cerfafr.modules.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
 			\file       htdocs/includes/modules/dons/html_cerfafr.modules.php
 			\ingroup    don
 			\brief      Formulaire de don
-			\version    $Id: html_cerfafr.modules.php,v 1.30 2011/07/31 23:28:14 eldy Exp $
+			\version    $Id$
 */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/dons/modules_don.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/dons/class/don.class.php");
diff --git a/htdocs/includes/modules/dons/modules_don.php b/htdocs/includes/modules/dons/modules_don.php
index 2b04f7f092d..6ef01d0731f 100644
--- a/htdocs/includes/modules/dons/modules_don.php
+++ b/htdocs/includes/modules/dons/modules_don.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
 	    \file       htdocs/includes/modules/dons/modules_don.php
 		\ingroup    don
 		\brief      Fichier contenant la classe m�re de generation des dons
-		\version    $Id: modules_don.php,v 1.20 2011/07/31 23:28:14 eldy Exp $
+		\version    $Id$
 */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/expedition/methode_expedition.modules.php b/htdocs/includes/modules/expedition/methode_expedition.modules.php
index b7c9b78edf4..5fe436eb5c5 100644
--- a/htdocs/includes/modules/expedition/methode_expedition.modules.php
+++ b/htdocs/includes/modules/expedition/methode_expedition.modules.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *	\ingroup    expedition
  *	\brief      Fichier contenant la classe mere de generation de bon de livraison en PDF
  *				et la classe mere de numerotation des bons de livraisons
- * 	\version	$Id: methode_expedition.modules.php,v 1.10 2011/07/31 23:28:14 eldy Exp $
+ * 	\version	$Id$
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
diff --git a/htdocs/includes/modules/expedition/mod_expedition_ribera.php b/htdocs/includes/modules/expedition/mod_expedition_ribera.php
index b73af2d7469..9c49eae8a3b 100755
--- a/htdocs/includes/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/includes/modules/expedition/mod_expedition_ribera.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *  \file       htdocs/includes/modules/expedition/mod_expedition_ribera.php
  *  \ingroup    expedition
  *  \brief      File of class to manage expedition numbering rules Ribera
- *  \version    $Id: mod_expedition_ribera.php,v 1.2 2011/07/31 23:28:14 eldy Exp $
+ *  \version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/expedition/modules_expedition.php");
diff --git a/htdocs/includes/modules/expedition/mod_expedition_safor.php b/htdocs/includes/modules/expedition/mod_expedition_safor.php
index 9691a525223..a7d1ec7dc9d 100755
--- a/htdocs/includes/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/includes/modules/expedition/mod_expedition_safor.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *  \file       htdocs/includes/modules/expedition/mod_expedition_safor.php
  *  \ingroup    expedition
  *  \brief      File of class to manage shipments numbering rules Safor
- *  \version    $Id: mod_expedition_safor.php,v 1.3 2011/07/31 23:28:14 eldy Exp $
+ *  \version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/expedition/modules_expedition.php");
 
diff --git a/htdocs/includes/modules/expedition/modules_expedition.php b/htdocs/includes/modules/expedition/modules_expedition.php
index c1335ebc9dc..dfdf420e905 100755
--- a/htdocs/includes/modules/expedition/modules_expedition.php
+++ b/htdocs/includes/modules/expedition/modules_expedition.php
@@ -17,7 +17,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -25,7 +26,7 @@
  *  \file       htdocs/includes/modules/expedition/modules_expedition.php
  *  \ingroup    expedition
  *  \brief      File of class to manage expedition numbering
- *  \version    $Id: modules_expedition.php,v 1.3 2011/07/31 23:28:14 eldy Exp $
+ *  \version    $Id$
  */
 
 class ModelNumRefExpedition
diff --git a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php b/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
index 34ae04b6766..9abbf28af0d 100644
--- a/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
+++ b/htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *  \file       htdocs/includes/modules/expedition/pdf/ModelePdfExpedition.class.php
  *  \ingroup    shipping
  *  \brief      Fichier contenant la classe mere de generation des expeditions
- *  \version    $Id: ModelePdfExpedition.class.php,v 1.16 2011/07/31 23:28:13 eldy Exp $
+ *  \version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
index 6b97bf3d4d5..3fa31ae73f7 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *	\file       htdocs/includes/modules/expedition/pdf/pdf_expedition_merou.modules.php
  *	\ingroup    expedition
  *	\brief      Fichier de la classe permettant de generer les bordereaux envoi au modele Merou
- *	\version    $Id: pdf_expedition_merou.modules.php,v 1.85 2011/07/31 23:28:13 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php";
diff --git a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
index 349bb32b719..82c400372bd 100644
--- a/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
+++ b/htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *	\file       htdocs/includes/modules/expedition/pdf/pdf_expedition_rouget.modules.php
  *	\ingroup    expedition
  *	\brief      Fichier de la classe permettant de generer les bordereaux envoi au modele Rouget
- *	\version    $Id: pdf_expedition_rouget.modules.php,v 1.60 2011/07/31 23:28:13 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once DOL_DOCUMENT_ROOT."/includes/modules/expedition/pdf/ModelePdfExpedition.class.php";
diff --git a/htdocs/includes/modules/export/export_csv.modules.php b/htdocs/includes/modules/export/export_csv.modules.php
index 257b95e4e3c..293f8f14ebe 100644
--- a/htdocs/includes/modules/export/export_csv.modules.php
+++ b/htdocs/includes/modules/export/export_csv.modules.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *		\ingroup    export
  *		\brief      File of class to build exports with CSV format
  *		\author	    Laurent Destailleur
- *		\version    $Id: export_csv.modules.php,v 1.30 2011/07/31 23:28:18 eldy Exp $
+ *		\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/export/modules_export.php");
@@ -65,7 +66,7 @@ class ExportCsv extends ModeleExports
 		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
 		$this->extension='csv';         // Extension for generated file by this driver
 		$this->picto='mime/other';		// Picto
-		$ver=explode(' ','$Revision: 1.30 $');
+		$ver=explode(' ','$Revision$');
 		$this->version=$ver[2];         // Driver version
 
 		// If driver use an external library, put its name here
diff --git a/htdocs/includes/modules/export/export_excel.modules.php b/htdocs/includes/modules/export/export_excel.modules.php
index 127eb16e389..32cdc6f3e92 100644
--- a/htdocs/includes/modules/export/export_excel.modules.php
+++ b/htdocs/includes/modules/export/export_excel.modules.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\ingroup    export
  *	\brief      File of class to generate export file with Excel format
  *	\author	    Laurent Destailleur
- *	\version    $Id: export_excel.modules.php,v 1.27 2011/07/31 23:28:18 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/export/modules_export.php");
@@ -64,7 +65,7 @@ class ExportExcel extends ModeleExports
 		$this->desc='<b>Excel</b> file format (.xls)<br>This is native Excel 95 format.';
 		$this->extension='xls';             // Extension for generated file by this driver
         $this->picto='mime/xls';					// Picto
-		$ver=explode(' ','$Revision: 1.27 $');
+		$ver=explode(' ','$Revision$');
 		$this->version=$ver[2];             // Driver version
 
 		// If driver use an external library, put its name here
diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php
index ec7e1af07c6..460f5b42979 100644
--- a/htdocs/includes/modules/export/modules_export.php
+++ b/htdocs/includes/modules/export/modules_export.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\file       htdocs/includes/modules/export/modules_export.php
  *	\ingroup    export
  *	\brief      File of parent class for export modules
- *	\version    $Id: modules_export.php,v 1.24 2011/07/31 23:28:18 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
diff --git a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 7994f9ffcb4..e42ecd75db5 100644
--- a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\ingroup    societe
  *	\brief      File of class to build ODT documents for third parties
  *	\author	    Laurent Destailleur
- *	\version    $Id: doc_generic_invoice_odt.modules.php,v 1.20 2011/07/31 23:28:15 eldy Exp $
+ *	\version    $Id: doc_generic_invoice_odt.modules.php,v 1.19 2011/07/21 22:54:36 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
diff --git a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php
index 272b400539a..275a7aedebd 100755
--- a/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/includes/modules/facture/doc/pdf_crabe.modules.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +25,7 @@
  *	\ingroup    facture
  *	\brief      File of class to generate invoices from crab model
  *	\author	    Laurent Destailleur
- *	\version    $Id: pdf_crabe.modules.php,v 1.12 2011/07/31 23:28:15 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
diff --git a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php
index 50991f60be7..12cc1769374 100755
--- a/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php
+++ b/htdocs/includes/modules/facture/doc/pdf_oursin.modules.php
@@ -16,7 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -25,7 +26,7 @@
  * 		\ingroup    facture
  * 		\brief      Fichier de la classe permettant de generer les factures au modele oursin
  * 		\author	    Sylvain SCATTOLINI base sur un modele de Laurent Destailleur
- * 		\version    $Id: pdf_oursin.modules.php,v 1.11 2011/07/31 23:28:15 eldy Exp $
+ * 		\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/includes/modules/facture/mod_facture_mercure.php b/htdocs/includes/modules/facture/mod_facture_mercure.php
index d5072345994..af57c9ff440 100644
--- a/htdocs/includes/modules/facture/mod_facture_mercure.php
+++ b/htdocs/includes/modules/facture/mod_facture_mercure.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *	\file       htdocs/includes/modules/facture/mod_facture_mercure.php
  *	\ingroup    facture
  *	\brief      File containing class for numbering module Mercure
- *	\version    $Id: mod_facture_mercure.php,v 1.7 2011/07/31 23:28:16 eldy Exp $
+ *	\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
 
diff --git a/htdocs/includes/modules/facture/mod_facture_terre.php b/htdocs/includes/modules/facture/mod_facture_terre.php
index ce1aa29283f..61ffbd6beb3 100644
--- a/htdocs/includes/modules/facture/mod_facture_terre.php
+++ b/htdocs/includes/modules/facture/mod_facture_terre.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\file       htdocs/includes/modules/facture/mod_facture_terre.php
  *	\ingroup    facture
  *	\brief      File containing class for numbering module Terre
- *	\version    $Id: mod_facture_terre.php,v 1.7 2011/07/31 23:28:16 eldy Exp $
+ *	\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php");
 
diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php
index d01c29a5a53..9e1640010f4 100644
--- a/htdocs/includes/modules/facture/modules_facture.php
+++ b/htdocs/includes/modules/facture/modules_facture.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +25,7 @@
  *	\ingroup    facture
  *	\brief      Fichier contenant la classe mere de generation des factures en PDF
  * 				et la classe mere de numerotation des factures
- *	\version    $Id: modules_facture.php,v 1.93 2011/07/31 23:28:16 eldy Exp $
+ *	\version    $Id: modules_facture.php,v 1.92 2011/07/04 10:35:48 hregis Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/fichinter/mod_arctic.php b/htdocs/includes/modules/fichinter/mod_arctic.php
index 4cdb6176fc7..8761d8e7743 100644
--- a/htdocs/includes/modules/fichinter/mod_arctic.php
+++ b/htdocs/includes/modules/fichinter/mod_arctic.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *	\file       htdocs/includes/modules/fichinter/mod_arctic.php
  *	\ingroup    fiche intervention
  *	\brief      File with Arctic numbering module for interventions
- *	\version    $Id: mod_arctic.php,v 1.19 2011/07/31 23:28:15 eldy Exp $
+ *	\version    $Id: mod_arctic.php,v 1.18 2011/07/02 15:46:02 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.php");
 
diff --git a/htdocs/includes/modules/fichinter/mod_pacific.php b/htdocs/includes/modules/fichinter/mod_pacific.php
index fc5ab868bb5..adc5a872971 100644
--- a/htdocs/includes/modules/fichinter/mod_pacific.php
+++ b/htdocs/includes/modules/fichinter/mod_pacific.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *  \file       htdocs/includes/modules/fichinter/mod_pacific.php
  *  \ingroup    fiche intervention
  *  \brief      File with Pacific numbering module for interventions
- *  \version    $Id: mod_pacific.php,v 1.13 2011/07/31 23:28:15 eldy Exp $
+ *  \version    $Id: mod_pacific.php,v 1.12 2011/07/02 15:46:02 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/fichinter/modules_fichinter.php");
 
diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php
index 47ef39e8cba..d99dfabba9c 100644
--- a/htdocs/includes/modules/fichinter/modules_fichinter.php
+++ b/htdocs/includes/modules/fichinter/modules_fichinter.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *  \ingroup    ficheinter
  *  \brief      Fichier contenant la classe mere de generation des fiches interventions en PDF
  *   et la classe mere de numerotation des fiches interventions
- *   \version    $Id: modules_fichinter.php,v 1.42 2011/07/31 23:28:15 eldy Exp $
+ *   \version    $Id: modules_fichinter.php,v 1.41 2011/07/10 13:48:25 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
index 73dbde338ed..f58d2118dcc 100644
--- a/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
+++ b/htdocs/includes/modules/fichinter/pdf_soleil.modules.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *	\file       htdocs/includes/modules/fichinter/pdf_soleil.modules.php
  *	\ingroup    ficheinter
  *	\brief      Fichier de la classe permettant de generer les fiches d'intervention au modele Soleil
- *	\version    $Id: pdf_soleil.modules.php,v 1.102 2011/07/31 23:28:15 eldy Exp $
+ *	\version    $Id: pdf_soleil.modules.php,v 1.101 2011/07/13 14:09:35 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
diff --git a/htdocs/includes/modules/import/import_csv.modules.php b/htdocs/includes/modules/import/import_csv.modules.php
index 5a3532c54ff..4273f92e477 100644
--- a/htdocs/includes/modules/import/import_csv.modules.php
+++ b/htdocs/includes/modules/import/import_csv.modules.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *		\ingroup    import
  *		\brief      File to load import files with CSV format
  *		\author	    Laurent Destailleur
- *		\version    $Id: import_csv.modules.php,v 1.33 2011/07/31 23:28:17 eldy Exp $
+ *		\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/import/modules_import.php");
@@ -71,7 +72,7 @@ class ImportCsv extends ModeleImports
 		$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
 		$this->extension='csv';         // Extension for generated file by this driver
 		$this->picto='mime/other';		// Picto
-		$ver=explode(' ','$Revision: 1.33 $');
+		$ver=explode(' ','$Revision$');
 		$this->version=$ver[2];         // Driver version
 
 		// If driver use an external library, put its name here
diff --git a/htdocs/includes/modules/import/modules_import.php b/htdocs/includes/modules/import/modules_import.php
index f1836e0eb8c..3db3aa1ff06 100644
--- a/htdocs/includes/modules/import/modules_import.php
+++ b/htdocs/includes/modules/import/modules_import.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\file       htdocs/includes/modules/import/modules_import.php
  *	\ingroup    export
  *	\brief      File of parent class for import file readers
- *	\version    $Id: modules_import.php,v 1.9 2011/07/31 23:28:17 eldy Exp $
+ *	\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
 
diff --git a/htdocs/includes/modules/livraison/mod_livraison_jade.php b/htdocs/includes/modules/livraison/mod_livraison_jade.php
index b7713a76d0d..c7408fdae80 100644
--- a/htdocs/includes/modules/livraison/mod_livraison_jade.php
+++ b/htdocs/includes/modules/livraison/mod_livraison_jade.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *   \file       htdocs/includes/modules/livraison/mod_livraison_jade.php
  *   \ingroup    delivery
  *   \brief      Fichier contenant la classe du modele de numerotation de reference de bon de livraison Jade
- *   \version    $Id: mod_livraison_jade.php,v 1.9 2011/07/31 23:28:14 eldy Exp $
+ *   \version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/livraison/modules_livraison.php");
diff --git a/htdocs/includes/modules/livraison/mod_livraison_saphir.php b/htdocs/includes/modules/livraison/mod_livraison_saphir.php
index f7fe6720a7f..6db8121bc00 100644
--- a/htdocs/includes/modules/livraison/mod_livraison_saphir.php
+++ b/htdocs/includes/modules/livraison/mod_livraison_saphir.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *	\file       htdocs/includes/modules/livraison/mod_livraison_saphir.php
  *	\ingroup    expedition
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de livraison Saphir
- *	\version    $Id: mod_livraison_saphir.php,v 1.8 2011/07/31 23:28:14 eldy Exp $
+ *	\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/livraison/modules_livraison.php");
 
diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/includes/modules/livraison/modules_livraison.php
index cbd09447e3d..e669e45e321 100644
--- a/htdocs/includes/modules/livraison/modules_livraison.php
+++ b/htdocs/includes/modules/livraison/modules_livraison.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +25,7 @@
  *	\ingroup    expedition
  *	\brief      Fichier contenant la classe mere de generation de bon de livraison en PDF
  *				et la classe mere de numerotation des bons de livraisons
- *	\version    $Id: modules_livraison.php,v 1.18 2011/07/31 23:28:14 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
index 84ad4ed54e9..b6e724875f7 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *	\file       htdocs/includes/modules/livraison/pdf/pdf_sirocco.modules.php
  *	\ingroup    livraison
  *	\brief      Fichier de la classe permettant de generer les bons de livraison au mod�le Sirocco
- *	\version    $Id: pdf_sirocco.modules.php,v 1.77 2011/07/31 23:28:17 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php");
diff --git a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
index fcbf9a52cb0..a7e5b91dfbc 100644
--- a/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
+++ b/htdocs/includes/modules/livraison/pdf/pdf_typhon.modules.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +25,7 @@
  *	\ingroup    livraison
  *	\brief      Fichier de la classe permettant de generer les bons de livraison au modele Typhon
  *	\author	    Laurent Destailleur
- *	\version    $Id: pdf_typhon.modules.php,v 1.86 2011/07/31 23:28:17 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/livraison/modules_livraison.php");
diff --git a/htdocs/includes/modules/mailings/contacts1.modules.php b/htdocs/includes/modules/mailings/contacts1.modules.php
index cbb4ad1c1fa..1cd59b616c2 100755
--- a/htdocs/includes/modules/mailings/contacts1.modules.php
+++ b/htdocs/includes/modules/mailings/contacts1.modules.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *	\file       htdocs/includes/modules/mailings/contacts1.modules.php
  *	\ingroup    mailing
  *	\brief      File of class to offer a selector of emailing targets with Rule 'Poire'.
- *	\version    $Id: contacts1.modules.php,v 1.2 2011/07/31 23:28:15 eldy Exp $
+ *	\version    $Id$
  */
 
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
diff --git a/htdocs/includes/modules/mailings/contacts2.modules.php b/htdocs/includes/modules/mailings/contacts2.modules.php
index 857e432d5c5..4f8cb109714 100755
--- a/htdocs/includes/modules/mailings/contacts2.modules.php
+++ b/htdocs/includes/modules/mailings/contacts2.modules.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *    	\file       htdocs/includes/modules/mailings/contacts2.modules.php
  *    	\ingroup    mailing
  *    	\brief      Provides a list of recipients for mailing module
- *    	\version    $Revision: 1.8 $
+ *    	\version    $Revision$
  */
 
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
diff --git a/htdocs/includes/modules/mailings/contacts3.modules.php b/htdocs/includes/modules/mailings/contacts3.modules.php
index b8ddb204c16..4e507e2fabb 100755
--- a/htdocs/includes/modules/mailings/contacts3.modules.php
+++ b/htdocs/includes/modules/mailings/contacts3.modules.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *     	\file       htdocs/includes/modules/mailings/contacts3.modules.php
  *     	\ingroup    mailing
  *     	\brief      Provides a list of recipients for mailing module
- *     	\version    $Revision: 1.4 $
+ *     	\version    $Revision$
  */
 
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
diff --git a/htdocs/includes/modules/mailings/fraise.modules.php b/htdocs/includes/modules/mailings/fraise.modules.php
index 7eb23ef768e..1d373a00739 100644
--- a/htdocs/includes/modules/mailings/fraise.modules.php
+++ b/htdocs/includes/modules/mailings/fraise.modules.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
        	\file       htdocs/includes/modules/mailings/fraise.modules.php
 		\ingroup    mailing
 		\brief      File of class to generate target according to rule Fraise
-		\version    $Id: fraise.modules.php,v 1.27 2011/07/31 23:28:15 eldy Exp $
+		\version    $Id$
 */
 
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
diff --git a/htdocs/includes/modules/mailings/modules_mailings.php b/htdocs/includes/modules/mailings/modules_mailings.php
index 626d45890da..1d35b08cf13 100644
--- a/htdocs/includes/modules/mailings/modules_mailings.php
+++ b/htdocs/includes/modules/mailings/modules_mailings.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *	    \file       htdocs/includes/modules/mailings/modules_mailings.php
  *		\ingroup    mailing
  *		\brief      File with parent class of emailing target selectors modules
- *		\version    $Id: modules_mailings.php,v 1.21 2011/07/31 23:28:15 eldy Exp $
+ *		\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
 
diff --git a/htdocs/includes/modules/mailings/peche.modules.php b/htdocs/includes/modules/mailings/peche.modules.php
index c64ddff71e7..d4761abde83 100644
--- a/htdocs/includes/modules/mailings/peche.modules.php
+++ b/htdocs/includes/modules/mailings/peche.modules.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *	\file       htdocs/includes/modules/mailings/peche.modules.php
  *	\ingroup    mailing
  *	\brief      File of class to offer a selector of emailing targets with Rule 'Peche'.
- *	\version    $Id: peche.modules.php,v 1.16 2011/07/31 23:28:15 eldy Exp $
+ *	\version    $Id$
  */
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
diff --git a/htdocs/includes/modules/mailings/pomme.modules.php b/htdocs/includes/modules/mailings/pomme.modules.php
index bd5d32592ba..9571e8399cf 100644
--- a/htdocs/includes/modules/mailings/pomme.modules.php
+++ b/htdocs/includes/modules/mailings/pomme.modules.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\file       htdocs/includes/modules/mailings/pomme.modules.php
  *	\ingroup    mailing
  *	\brief      File of class to offer a selector of emailing targets with Rule 'Pomme'.
- *	\version    $Id: pomme.modules.php,v 1.19 2011/07/31 23:28:15 eldy Exp $
+ *	\version    $Id$
  */
 include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php';
 
diff --git a/htdocs/includes/modules/member/cards/modules_cards.php b/htdocs/includes/modules/member/cards/modules_cards.php
index f4be0c1e061..8a3409f3030 100644
--- a/htdocs/includes/modules/member/cards/modules_cards.php
+++ b/htdocs/includes/modules/member/cards/modules_cards.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *	\file       htdocs/includes/modules/member/cards/modules_cards.php
  *	\ingroup    member
  *	\brief      File of parent class of document generator for members cards.
- *	\version    $Id: modules_cards.php,v 1.11 2011/07/31 23:28:18 eldy Exp $
+ *	\version    $Id: modules_cards.php,v 1.10 2011/07/04 08:53:01 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/member/cards/pdf_standard.class.php b/htdocs/includes/modules/member/cards/pdf_standard.class.php
index 0f7007eb38e..c25d94355f7 100644
--- a/htdocs/includes/modules/member/cards/pdf_standard.class.php
+++ b/htdocs/includes/modules/member/cards/pdf_standard.class.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /* Inspire de PDF_Label
@@ -60,7 +61,7 @@
  *	\author	    Laurent Passebecq
  *	\author	    Rodolphe Quiedville
  *	\author	    Jean Louis Bergamo.
- *	\version    $Id: pdf_standard.class.php,v 1.22 2011/07/31 23:28:18 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/member/labels/modules_labels.php b/htdocs/includes/modules/member/labels/modules_labels.php
index c375ed8ac5c..773772d3823 100644
--- a/htdocs/includes/modules/member/labels/modules_labels.php
+++ b/htdocs/includes/modules/member/labels/modules_labels.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *	\file       htdocs/includes/modules/member/labels/modules_labels.php
  *	\ingroup    member
  *	\brief      File of parent class of document generator for members labels sheets.
- *	\version    $Id: modules_labels.php,v 1.2 2011/07/31 23:28:14 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
index 40b0f4f23ad..46c7b063b18 100644
--- a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
+++ b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /* Inspire de PDF_Label
@@ -60,7 +61,7 @@
  *	\author	    Laurent Passebecq
  *	\author	    Rodolphe Quiedville
  *	\author	    Jean Louis Bergamo.
- *	\version    $Id: pdf_standardlabel.class.php,v 1.13 2011/07/31 23:28:14 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php
index 1b82f89f67a..b17d5742b5d 100644
--- a/htdocs/includes/modules/modAdherent.class.php
+++ b/htdocs/includes/modules/modAdherent.class.php
@@ -16,7 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
@@ -28,7 +29,7 @@
  *		\file       htdocs/includes/modules/modAdherent.class.php
  *      \ingroup    member
  *      \brief      File descriptor or module Member
- *		\version	$Id: modAdherent.class.php,v 1.87 2011/07/31 23:28:11 eldy Exp $
+ *		\version	$Id$
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
diff --git a/htdocs/includes/modules/modAgenda.class.php b/htdocs/includes/modules/modAgenda.class.php
index b187f68a1c7..3a01b9f50da 100644
--- a/htdocs/includes/modules/modAgenda.class.php
+++ b/htdocs/includes/modules/modAgenda.class.php
@@ -17,13 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\defgroup   agenda     Module agenda
  *      \brief      Module pour gerer l'agenda et actions
- *		\brief		$Id: modAgenda.class.php,v 1.39 2011/07/31 23:28:10 eldy Exp $
+ *		\brief		$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modBanque.class.php b/htdocs/includes/modules/modBanque.class.php
index 261b5f3a48f..7cd88ca981d 100644
--- a/htdocs/includes/modules/modBanque.class.php
+++ b/htdocs/includes/modules/modBanque.class.php
@@ -16,12 +16,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**     \defgroup   banque     Module bank
  *		\brief      Module pour gerer la tenue d'un compte bancaire et rapprochements
- *		\version	$Id: modBanque.class.php,v 1.65 2011/07/31 23:28:12 eldy Exp $
+ *		\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modBarcode.class.php b/htdocs/includes/modules/modBarcode.class.php
index 216c4363a8a..4a93925d7ff 100644
--- a/htdocs/includes/modules/modBarcode.class.php
+++ b/htdocs/includes/modules/modBarcode.class.php
@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\defgroup   barcode         Module barcode
  *	\brief      Module pour gerer les codes barres
- *	\version	$Id: modBarcode.class.php,v 1.28 2011/07/31 23:28:11 eldy Exp $
+ *	\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modBookmark.class.php b/htdocs/includes/modules/modBookmark.class.php
index 7c8fd6d1ec6..d86b8f3a523 100644
--- a/htdocs/includes/modules/modBookmark.class.php
+++ b/htdocs/includes/modules/modBookmark.class.php
@@ -13,13 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\defgroup   bookmark    Module bookmarks
  *	\brief      Module to manage Bookmarks
- *	\version	$Id: modBookmark.class.php,v 1.26 2011/07/31 23:28:12 eldy Exp $
+ *	\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modBoutique.class.php b/htdocs/includes/modules/modBoutique.class.php
index 3acc326ecc5..6d7d40e9437 100644
--- a/htdocs/includes/modules/modBoutique.class.php
+++ b/htdocs/includes/modules/modBoutique.class.php
@@ -15,13 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**    
  * 	\defgroup   oscommerce     Module oscommerce
  *	\brief      Module pour gerer une boutique et interface avec OSCommerce
- *	\version	$Id: modBoutique.class.php,v 1.39 2011/07/31 23:28:12 eldy Exp $
+ *	\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modCashDesk.class.php b/htdocs/includes/modules/modCashDesk.class.php
index 73101b8ca7a..57667425bde 100644
--- a/htdocs/includes/modules/modCashDesk.class.php
+++ b/htdocs/includes/modules/modCashDesk.class.php
@@ -12,13 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \defgroup   pos       Module points of sale
  *      \brief      Module to manage points of sale
- *		\version	$Id: modCashDesk.class.php,v 1.26 2011/07/31 23:28:12 eldy Exp $
+ *		\version	$Id: modCashDesk.class.php,v 1.25 2011/06/29 22:41:49 eldy Exp $
  */
 
 /**
@@ -54,7 +55,7 @@ class modCashDesk extends DolibarrModules
 		$this->name = preg_replace('/^mod/i','',get_class($this));
 		$this->description = "CashDesk module";
 
-		$this->revision = explode(' ','$Revision: 1.26 $');
+		$this->revision = explode(' ','$Revision: 1.25 $');
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
diff --git a/htdocs/includes/modules/modCategorie.class.php b/htdocs/includes/modules/modCategorie.class.php
index e808eec06a5..5ead1e6b531 100644
--- a/htdocs/includes/modules/modCategorie.class.php
+++ b/htdocs/includes/modules/modCategorie.class.php
@@ -13,13 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \defgroup   category       Module categories
  *      \brief      Module to manage categories
- *		\version	$Id: modCategorie.class.php,v 1.39 2011/07/31 23:28:09 eldy Exp $
+ *		\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modClickToDial.class.php b/htdocs/includes/modules/modClickToDial.class.php
index 2d695d630b2..f0e340a36ec 100644
--- a/htdocs/includes/modules/modClickToDial.class.php
+++ b/htdocs/includes/modules/modClickToDial.class.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
@@ -25,7 +26,7 @@
  *	\file       htdocs/includes/modules/modClickToDial.class.php
  *	\ingroup    clicktodial
  *	\brief      Fichier de description et activation du module de click to Dial
- *	\version	$Id: modClickToDial.class.php,v 1.22 2011/07/31 23:28:10 eldy Exp $
+ *	\version	$Id$
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
diff --git a/htdocs/includes/modules/modCommande.class.php b/htdocs/includes/modules/modCommande.class.php
index 3ea748fc423..64a70c435f9 100644
--- a/htdocs/includes/modules/modCommande.class.php
+++ b/htdocs/includes/modules/modCommande.class.php
@@ -17,13 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\defgroup   commande     Module orders
  *		\brief      Module pour gerer le suivi des commandes
- *		\version	$Id: modCommande.class.php,v 1.81 2011/07/31 23:28:11 eldy Exp $
+ *		\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modComptabilite.class.php b/htdocs/includes/modules/modComptabilite.class.php
index 121fce7f7f9..b3c88311c7c 100644
--- a/htdocs/includes/modules/modComptabilite.class.php
+++ b/htdocs/includes/modules/modComptabilite.class.php
@@ -15,12 +15,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**     \defgroup   comptabilite     Module comptabilite
         \brief      Module pour inclure des fonctions de comptabilite (gestion de comptes comptables et rapports)
-		\version	$Id: modComptabilite.class.php,v 1.57 2011/07/31 23:28:11 eldy Exp $
+		\version	$Id$
 */
 
 /**
diff --git a/htdocs/includes/modules/modContrat.class.php b/htdocs/includes/modules/modContrat.class.php
index 9c0ff9ccdf9..07a73d800a3 100644
--- a/htdocs/includes/modules/modContrat.class.php
+++ b/htdocs/includes/modules/modContrat.class.php
@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\defgroup   contrat     Module contract
  *	\brief      Module pour gerer la tenue de contrat de services
- *	\version	$Id: modContrat.class.php,v 1.41 2011/07/31 23:28:11 eldy Exp $
+ *	\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modDeplacement.class.php b/htdocs/includes/modules/modDeplacement.class.php
index da3d490edc4..d9972308ccb 100644
--- a/htdocs/includes/modules/modDeplacement.class.php
+++ b/htdocs/includes/modules/modDeplacement.class.php
@@ -13,13 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\defgroup   deplacement     Module trips
  *	\brief      Module pour gerer les deplacements et notes de frais
- *	\version	$Id: modDeplacement.class.php,v 1.29 2011/07/31 23:28:12 eldy Exp $
+ *	\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modDon.class.php b/htdocs/includes/modules/modDon.class.php
index 070b1b7c74b..cfb2d71afe3 100644
--- a/htdocs/includes/modules/modDon.class.php
+++ b/htdocs/includes/modules/modDon.class.php
@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\defgroup   don     Module donation
  *	\brief      Module pour gerer le suivi des dons
- *	\version	$Id: modDon.class.php,v 1.39 2011/07/31 23:28:11 eldy Exp $
+ *	\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modECM.class.php b/htdocs/includes/modules/modECM.class.php
index 979c02d5836..371146989ec 100644
--- a/htdocs/includes/modules/modECM.class.php
+++ b/htdocs/includes/modules/modECM.class.php
@@ -13,12 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**     \defgroup   ecm		Module ecm
  *      \brief      Module for ECM (Electronic Content Management)
- *		\version	$Id: modECM.class.php,v 1.36 2011/07/31 23:28:12 eldy Exp $
+ *		\version	$Id$
 */
 
 /**
diff --git a/htdocs/includes/modules/modExport.class.php b/htdocs/includes/modules/modExport.class.php
index 18b55fae9c2..523678eca7f 100644
--- a/htdocs/includes/modules/modExport.class.php
+++ b/htdocs/includes/modules/modExport.class.php
@@ -13,12 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**     \defgroup   export      Module export
  *		\brief      Module generique pour realiser des exports de donnees en base
- * 		\version	$Id: modExport.class.php,v 1.17 2011/07/31 23:28:12 eldy Exp $
+ * 		\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modExternalRss.class.php b/htdocs/includes/modules/modExternalRss.class.php
index 2d11e7f7266..a09ca28bfc5 100644
--- a/htdocs/includes/modules/modExternalRss.class.php
+++ b/htdocs/includes/modules/modExternalRss.class.php
@@ -13,13 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *  \defgroup   externalrss     Module externalrss
  *	\brief      Module pour inclure des informations externes RSS
- *	\version	$Id: modExternalRss.class.php,v 1.37 2011/07/31 23:28:12 eldy Exp $
+ *	\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modExternalSite.class.php b/htdocs/includes/modules/modExternalSite.class.php
index 0862d876777..6cc0e601952 100644
--- a/htdocs/includes/modules/modExternalSite.class.php
+++ b/htdocs/includes/modules/modExternalSite.class.php
@@ -14,12 +14,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**     \defgroup   externalsite     Module externalsite
         \brief      Module to include an external web site/tools into Dolibarr menu and into a frame page.
-		\version	$Id: modExternalSite.class.php,v 1.3 2011/07/31 23:28:10 eldy Exp $
+		\version	$Id$
 */
 
 /**
diff --git a/htdocs/includes/modules/modFTP.class.php b/htdocs/includes/modules/modFTP.class.php
index e3c0127f1b1..ea6236cda7b 100644
--- a/htdocs/includes/modules/modFTP.class.php
+++ b/htdocs/includes/modules/modFTP.class.php
@@ -13,12 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**     \defgroup   ftp		Module FTP
  *      \brief      Module for FTP client module
- *		\version	$Id: modFTP.class.php,v 1.10 2011/07/31 23:28:11 eldy Exp $
+ *		\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php
index 9eb1a11a5d3..51c17d203df 100644
--- a/htdocs/includes/modules/modFacture.class.php
+++ b/htdocs/includes/modules/modFacture.class.php
@@ -16,13 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  * 		\defgroup   facture     Module invoices
  *      \brief      Module pour gerer les factures clients et/ou fournisseurs
- *		\version	$Id: modFacture.class.php,v 1.115 2011/07/31 23:28:10 eldy Exp $
+ *		\version	$Id$
  */
 
 
diff --git a/htdocs/includes/modules/modFckeditor.class.php b/htdocs/includes/modules/modFckeditor.class.php
index 0f3e7364a6a..57d75a44351 100644
--- a/htdocs/includes/modules/modFckeditor.class.php
+++ b/htdocs/includes/modules/modFckeditor.class.php
@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *  \defgroup   fckeditor     Module fckeditor
  *  \brief      Module pour mettre en page les zones de saisie de texte
- *  \version	$Id: modFckeditor.class.php,v 1.21 2011/07/31 23:28:12 eldy Exp $
+ *  \version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modFournisseur.class.php b/htdocs/includes/modules/modFournisseur.class.php
index c4f254d9c4e..0ec7274044b 100644
--- a/htdocs/includes/modules/modFournisseur.class.php
+++ b/htdocs/includes/modules/modFournisseur.class.php
@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  * 		\defgroup   fournisseur     Module suppliers
  *		\brief      Module pour gerer des societes et contacts de type fournisseurs
- *		\version	$Id: modFournisseur.class.php,v 1.95 2011/07/31 23:28:11 eldy Exp $
+ *		\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modGeoIPMaxmind.class.php b/htdocs/includes/modules/modGeoIPMaxmind.class.php
index 39d3059bd53..7b8fb029d27 100644
--- a/htdocs/includes/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/includes/modules/modGeoIPMaxmind.class.php
@@ -12,12 +12,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**     \defgroup   geoip      Module GeoIP
  *		\brief      Module to make geoip conversions
- *		\version	$Id: modGeoIPMaxmind.class.php,v 1.6 2011/07/31 23:28:12 eldy Exp $
+ *		\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modGravatar.class.php b/htdocs/includes/modules/modGravatar.class.php
index 6902b3b0b16..8240e96e469 100644
--- a/htdocs/includes/modules/modGravatar.class.php
+++ b/htdocs/includes/modules/modGravatar.class.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**     \defgroup   gravatar     Module gravatar
@@ -24,7 +25,7 @@
  *      \file       htdocs/includes/modules/modGravatar.class.php
  *      \ingroup    gravatar
  *      \brief      Description and activation file for module Gravatar
- *		\version	$Id: modGravatar.class.php,v 1.10 2011/07/31 23:28:12 eldy Exp $
+ *		\version	$Id$
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
diff --git a/htdocs/includes/modules/modImport.class.php b/htdocs/includes/modules/modImport.class.php
index dd9f8e3ad7d..2e51a01c807 100644
--- a/htdocs/includes/modules/modImport.class.php
+++ b/htdocs/includes/modules/modImport.class.php
@@ -13,12 +13,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**     \defgroup   import      Module import
  *		\brief      Module to make generic import of data into dolibarr database
- *		\version	$Id: modImport.class.php,v 1.21 2011/07/31 23:28:12 eldy Exp $
+ *		\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modLdap.class.php b/htdocs/includes/modules/modLdap.class.php
index a5b042af300..a8158126919 100644
--- a/htdocs/includes/modules/modLdap.class.php
+++ b/htdocs/includes/modules/modLdap.class.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
@@ -26,7 +27,7 @@
  *	\file       htdocs/includes/modules/modLdap.class.php
  *	\ingroup    ldap
  *	\brief      Fichier de description et activation du module Ldap
- *	\version	$Id: modLdap.class.php,v 1.35 2011/07/31 23:28:12 eldy Exp $
+ *	\version	$Id$
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
diff --git a/htdocs/includes/modules/modMantis.class.php b/htdocs/includes/modules/modMantis.class.php
index bcca85b6946..9895c2a9fc6 100644
--- a/htdocs/includes/modules/modMantis.class.php
+++ b/htdocs/includes/modules/modMantis.class.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**     \defgroup   mantis     Module mantis
@@ -24,7 +25,7 @@
         \file       htdocs/includes/modules/modMantis.class.php
         \ingroup    mantis
         \brief      Description and activation file for module Mantis
-		\version	$Id: modMantis.class.php,v 1.16 2011/07/31 23:28:10 eldy Exp $
+		\version	$Id$
 */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
diff --git a/htdocs/includes/modules/modNotification.class.php b/htdocs/includes/modules/modNotification.class.php
index f1f7a764541..dc96477db54 100644
--- a/htdocs/includes/modules/modNotification.class.php
+++ b/htdocs/includes/modules/modNotification.class.php
@@ -13,13 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\defgroup   notification	Module email notification
  *	\brief      Module pour gerer les notifications (par mail ou autre)
- *	\version	$Id: modNotification.class.php,v 1.15 2011/07/31 23:28:12 eldy Exp $
+ *	\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modPaybox.class.php b/htdocs/includes/modules/modPaybox.class.php
index f23934f6d5b..ce586ac0177 100644
--- a/htdocs/includes/modules/modPaybox.class.php
+++ b/htdocs/includes/modules/modPaybox.class.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**     \defgroup   paybox     Module paybox
@@ -24,7 +25,7 @@
  *      \file       htdocs/includes/modules/modPaybox.class.php
  *      \ingroup    paybox
  *      \brief      Description and activation file for module Paybox
- *		\version	$Id: modPaybox.class.php,v 1.20 2011/07/31 23:28:11 eldy Exp $
+ *		\version	$Id$
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
diff --git a/htdocs/includes/modules/modPaypal.class.php b/htdocs/includes/modules/modPaypal.class.php
index 79e748cec63..715886d2b50 100644
--- a/htdocs/includes/modules/modPaypal.class.php
+++ b/htdocs/includes/modules/modPaypal.class.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**     \defgroup   paypal     Module paypal
@@ -25,7 +26,7 @@
  *      \file       htdocs/includes/modules/modPaypal.class.php
  *      \ingroup    paypal
  *      \brief      Description and activation file for module Paypal
- *		\version	$Id: modPaypal.class.php,v 1.12 2011/07/31 23:28:12 eldy Exp $
+ *		\version	$Id$
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
diff --git a/htdocs/includes/modules/modPrelevement.class.php b/htdocs/includes/modules/modPrelevement.class.php
index cfa5caed448..059c6ca4d80 100644
--- a/htdocs/includes/modules/modPrelevement.class.php
+++ b/htdocs/includes/modules/modPrelevement.class.php
@@ -15,13 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\defgroup   	prelevement     Module prelevement
  *	\brief      	Module de gestion des prelevements bancaires
- *	\version		$Id: modPrelevement.class.php,v 1.42 2011/07/31 23:28:10 eldy Exp $
+ *	\version		$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modProduct.class.php b/htdocs/includes/modules/modProduct.class.php
index 3c38ded4c84..360e5a518c1 100644
--- a/htdocs/includes/modules/modProduct.class.php
+++ b/htdocs/includes/modules/modProduct.class.php
@@ -16,13 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\defgroup   produit     Module products
  *	\brief      Module pour gerer le suivi de produits predefinis
- *	\version	$Id: modProduct.class.php,v 1.13 2011/07/31 23:28:12 eldy Exp $
+ *	\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modProjet.class.php b/htdocs/includes/modules/modProjet.class.php
index d35814ac94c..7da6f774870 100644
--- a/htdocs/includes/modules/modProjet.class.php
+++ b/htdocs/includes/modules/modProjet.class.php
@@ -16,13 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *  \defgroup   projet     Module project
  *	\brief      Module to create projects/tasks/gantt diagram. Projects can them be affected to tasks.
- * 	\version	$Id: modProjet.class.php,v 1.43 2011/07/31 23:28:10 eldy Exp $
+ * 	\version	$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modPropale.class.php b/htdocs/includes/modules/modPropale.class.php
index 9d93d70cb45..698982e0622 100644
--- a/htdocs/includes/modules/modPropale.class.php
+++ b/htdocs/includes/modules/modPropale.class.php
@@ -16,7 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
@@ -28,7 +29,7 @@
  *	\file       htdocs/includes/modules/modPropale.class.php
  *	\ingroup    propale
  *	\brief      Fichier de description et activation du module Propale
- * 	\version	$Id: modPropale.class.php,v 1.78 2011/07/31 23:28:11 eldy Exp $
+ * 	\version	$Id$
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
diff --git a/htdocs/includes/modules/modService.class.php b/htdocs/includes/modules/modService.class.php
index 18ef64894f1..7a0a51ec6e8 100644
--- a/htdocs/includes/modules/modService.class.php
+++ b/htdocs/includes/modules/modService.class.php
@@ -16,9 +16,10 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: modService.class.php,v 1.51 2011/07/31 23:28:10 eldy Exp $
+ * $Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php
index 6adaa84391d..373b3ba3a5c 100644
--- a/htdocs/includes/modules/modSociete.class.php
+++ b/htdocs/includes/modules/modSociete.class.php
@@ -16,13 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\defgroup   societe     Module societe
  *	\brief      Module to manage third parties (customers, prospects)
- *	\version	$Id: modSociete.class.php,v 1.119 2011/07/31 23:28:10 eldy Exp $
+ *	\version	$Id: modSociete.class.php,v 1.118 2011/07/01 23:07:26 eldy Exp $
  */
 
 /**
diff --git a/htdocs/includes/modules/modStock.class.php b/htdocs/includes/modules/modStock.class.php
index d8aab3caea5..2a6aff8a3f1 100644
--- a/htdocs/includes/modules/modStock.class.php
+++ b/htdocs/includes/modules/modStock.class.php
@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\defgroup   	stock     Module stocks
  *	\brief      	Module pour gerer la tenue de stocks produits
- *	\version		$Id: modStock.class.php,v 1.36 2011/07/31 23:28:11 eldy Exp $
+ *	\version		$Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/modSyslog.class.php b/htdocs/includes/modules/modSyslog.class.php
index f5445198513..58322541dc6 100644
--- a/htdocs/includes/modules/modSyslog.class.php
+++ b/htdocs/includes/modules/modSyslog.class.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/htdocs/includes/modules/modUser.class.php b/htdocs/includes/modules/modUser.class.php
index e3c055bc212..c7284b0697d 100644
--- a/htdocs/includes/modules/modUser.class.php
+++ b/htdocs/includes/modules/modUser.class.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
diff --git a/htdocs/includes/modules/modWebServices.class.php b/htdocs/includes/modules/modWebServices.class.php
index 14753f19a95..1b46f951ed4 100644
--- a/htdocs/includes/modules/modWebServices.class.php
+++ b/htdocs/includes/modules/modWebServices.class.php
@@ -12,13 +12,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \defgroup   webservices     Module webservices
  *      \brief      Module to enable the Dolibarr server of web services
- *		\brief		$Id: modWebServices.class.php,v 1.7 2011/07/31 23:28:10 eldy Exp $
+ *		\brief		$Id$
 */
 
 /**
diff --git a/htdocs/includes/modules/modWorkflow.class.php b/htdocs/includes/modules/modWorkflow.class.php
index 42780551928..7945634a1c9 100644
--- a/htdocs/includes/modules/modWorkflow.class.php
+++ b/htdocs/includes/modules/modWorkflow.class.php
@@ -13,13 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \defgroup   workflow     Module workflow
  *      \brief      Workflow management
- *      \version    $Id: modWorkflow.class.php,v 1.10 2011/07/31 23:28:10 eldy Exp $
+ *      \version    $Id$
  */
 
 /**
diff --git a/htdocs/includes/modules/project/mod_project_simple.php b/htdocs/includes/modules/project/mod_project_simple.php
index d701e142e4d..a5def662410 100644
--- a/htdocs/includes/modules/project/mod_project_simple.php
+++ b/htdocs/includes/modules/project/mod_project_simple.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\file       htdocs/includes/modules/project/mod_project_simple.php
  *	\ingroup    project
  *	\brief      File with class to manage the numbering module Simple for project references
- *	\version    $Id: mod_project_simple.php,v 1.6 2011/07/31 23:28:09 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/modules_project.php");
diff --git a/htdocs/includes/modules/project/mod_project_universal.php b/htdocs/includes/modules/project/mod_project_universal.php
index 1b79f0bdcc1..7df265565f2 100644
--- a/htdocs/includes/modules/project/mod_project_universal.php
+++ b/htdocs/includes/modules/project/mod_project_universal.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *	\file       htdocs/includes/modules/project/mod_project_universal.php
  *	\ingroup    project
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de projet Universal
- *	\version    $Id: mod_project_universal.php,v 1.4 2011/07/31 23:28:09 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/project/modules_project.php");
diff --git a/htdocs/includes/modules/project/modules_project.php b/htdocs/includes/modules/project/modules_project.php
index 983418c0854..868ddf3a3f9 100644
--- a/htdocs/includes/modules/project/modules_project.php
+++ b/htdocs/includes/modules/project/modules_project.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *      \ingroup    project
  *      \brief      File that contain parent class for projects models
  *                  and parent class for projects numbering models
- *      \version    $Id: modules_project.php,v 1.12 2011/07/31 23:28:09 eldy Exp $
+ *      \version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
diff --git a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
index fb253da1e8f..a8483b52240 100644
--- a/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
+++ b/htdocs/includes/modules/project/pdf/pdf_baleine.modules.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\ingroup    project
  *	\brief      Fichier de la classe permettant de generer les projets au modele Baleine
  *	\author	    Regis Houssin
- *	\version    $Id: pdf_baleine.modules.php,v 1.39 2011/07/31 23:28:18 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/project/modules_project.php");
diff --git a/htdocs/includes/modules/propale/mod_propale_marbre.php b/htdocs/includes/modules/propale/mod_propale_marbre.php
index 3e2ef70cb12..10064267c70 100644
--- a/htdocs/includes/modules/propale/mod_propale_marbre.php
+++ b/htdocs/includes/modules/propale/mod_propale_marbre.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *    	\file       htdocs/includes/modules/propale/mod_propale_marbre.php
  *		\ingroup    propale
  *		\brief      File of class to manage commercial proposal numbering rules Marbre
- *		\version    $Id: mod_propale_marbre.php,v 1.28 2011/07/31 23:28:16 eldy Exp $
+ *		\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
diff --git a/htdocs/includes/modules/propale/mod_propale_saphir.php b/htdocs/includes/modules/propale/mod_propale_saphir.php
index 957a57c0126..4c78a7134c9 100644
--- a/htdocs/includes/modules/propale/mod_propale_saphir.php
+++ b/htdocs/includes/modules/propale/mod_propale_saphir.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
 	\file       htdocs/includes/modules/propale/mod_propale_saphir.php
 	\ingroup    propale
 	\brief      File that contains the numbering module rules Saphir
-	\version    $Id: mod_propale_saphir.php,v 1.28 2011/07/31 23:28:16 eldy Exp $
+	\version    $Id$
 */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php
index 972db7bd3e8..b4572034c3a 100644
--- a/htdocs/includes/modules/propale/modules_propale.php
+++ b/htdocs/includes/modules/propale/modules_propale.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *  \ingroup    propale
  *  \brief      Fichier contenant la classe mere de generation des propales en PDF
  *  			et la classe mere de numerotation des propales
- *	\version    $Id: modules_propale.php,v 1.63 2011/07/31 23:28:16 eldy Exp $
+ *	\version    $Id: modules_propale.php,v 1.62 2011/07/04 10:35:49 hregis Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index f0803e92621..c39973fd7a8 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +25,7 @@
  *	\ingroup    propale
  *	\brief      Fichier de la classe permettant de generer les propales au modele Azur
  *	\author	    Laurent Destailleur
- *	\version    $Id: pdf_propale_azur.modules.php,v 1.243 2011/07/31 23:28:16 eldy Exp $
+ *	\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php");
 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
diff --git a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
index 4014979dae0..a00ed488846 100644
--- a/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  * 	\file       htdocs/includes/modules/propale/pdf_propale_jaune.modules.php
  *	\ingroup    propale
  *	\brief      Fichier de la classe permettant de generer les propales au modele Jaune
- *	\version    $Id: pdf_propale_jaune.modules.php,v 1.117 2011/07/31 23:28:16 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php");
diff --git a/htdocs/includes/modules/rapport/pdf_paiement.class.php b/htdocs/includes/modules/rapport/pdf_paiement.class.php
index 51fd1d8b23b..79bcae814e3 100644
--- a/htdocs/includes/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/includes/modules/rapport/pdf_paiement.class.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\file       htdocs/includes/modules/rapport/pdf_paiement.class.php
  *	\ingroup    banque
  *	\brief      File to build payment reports
- *	\version    $Id: pdf_paiement.class.php,v 1.64 2011/07/31 23:28:13 eldy Exp $
+ *	\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
diff --git a/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php b/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php
index 26e7cb02953..e3a1d8acbcf 100644
--- a/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php
+++ b/htdocs/includes/modules/security/generate/modGeneratePassNone.class.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *      \file       htdocs/includes/modules/security/generate/modGeneratePassNone.class.php
  *      \ingroup    core
  *      \brief      File to manage no password generation.
- *		\version	$Id: modGeneratePassNone.class.php,v 1.7 2011/07/31 23:28:16 eldy Exp $
+ *		\version	$Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/security/generate/modules_genpassword.php");
diff --git a/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php
index 292bc4ff19a..6437181d229 100644
--- a/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *      \file       htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php
  *      \ingroup    core
  *		\brief      File to manage password generation according to standard rule
- *		\version	$Id: modGeneratePassStandard.class.php,v 1.10 2011/07/31 23:28:16 eldy Exp $
+ *		\version	$Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/security/generate/modules_genpassword.php");
diff --git a/htdocs/includes/modules/security/generate/modules_genpassword.php b/htdocs/includes/modules/security/generate/modules_genpassword.php
index c39d6e38d46..a326d8c40c0 100644
--- a/htdocs/includes/modules/security/generate/modules_genpassword.php
+++ b/htdocs/includes/modules/security/generate/modules_genpassword.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *		\file       htdocs/includes/modules/security/generate/modules_genpassword.php
  *		\ingroup    core
  *		\brief      File with parent class for password generating classes
- *		\version    $Id: modules_genpassword.php,v 1.7 2011/07/31 23:28:16 eldy Exp $
+ *		\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/functions.lib.php');
 
diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
index 5cbad3302c7..65e9a1ddd06 100644
--- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\ingroup    societe
  *	\brief      File of class to build ODT documents for third parties
  *	\author	    Laurent Destailleur
- *	\version    $Id: doc_generic_odt.modules.php,v 1.33 2011/07/31 23:28:18 eldy Exp $
+ *	\version    $Id: doc_generic_odt.modules.php,v 1.32 2011/07/21 22:54:35 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
diff --git a/htdocs/includes/modules/societe/mod_codeclient_elephant.php b/htdocs/includes/modules/societe/mod_codeclient_elephant.php
index a000c4f4cb8..103f791a6af 100644
--- a/htdocs/includes/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/includes/modules/societe/mod_codeclient_elephant.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *       \file       htdocs/includes/modules/societe/mod_codeclient_elephant.php
  *       \ingroup    societe
  *       \brief      File of class to manage third party code with elephant rule
- *       \version    $Id: mod_codeclient_elephant.php,v 1.15 2011/07/31 23:28:14 eldy Exp $
+ *       \version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
diff --git a/htdocs/includes/modules/societe/mod_codeclient_leopard.php b/htdocs/includes/modules/societe/mod_codeclient_leopard.php
index b0a22623423..8a893403750 100644
--- a/htdocs/includes/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/includes/modules/societe/mod_codeclient_leopard.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *       \file       htdocs/includes/modules/societe/mod_codeclient_leopard.php
  *       \ingroup    societe
  *       \brief      Fichier de la classe des gestion leopard des codes clients
- *       \version    $Id: mod_codeclient_leopard.php,v 1.17 2011/07/31 23:28:14 eldy Exp $
+ *       \version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
diff --git a/htdocs/includes/modules/societe/mod_codeclient_monkey.php b/htdocs/includes/modules/societe/mod_codeclient_monkey.php
index c5735dd63e0..12bea62c76c 100644
--- a/htdocs/includes/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/includes/modules/societe/mod_codeclient_monkey.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *       \file       htdocs/includes/modules/societe/mod_codeclient_monkey.php
  *       \ingroup    societe
  *       \brief      Fichier de la classe des gestion lion des codes clients
- *       \version    $Id: mod_codeclient_monkey.php,v 1.11 2011/07/31 23:28:14 eldy Exp $
+ *       \version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
diff --git a/htdocs/includes/modules/societe/mod_codecompta_aquarium.php b/htdocs/includes/modules/societe/mod_codecompta_aquarium.php
index 983a6835752..26cc3507633 100644
--- a/htdocs/includes/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/includes/modules/societe/mod_codecompta_aquarium.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  \file       htdocs/includes/modules/societe/mod_codecompta_aquarium.php
  \ingroup    societe
  \brief      Fichier de la classe des gestion aquarium des codes compta des societes clientes
- \version    $Id: mod_codecompta_aquarium.php,v 1.17 2011/07/31 23:28:14 eldy Exp $
+ \version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
diff --git a/htdocs/includes/modules/societe/mod_codecompta_digitaria.php b/htdocs/includes/modules/societe/mod_codecompta_digitaria.php
index b2a7b15a233..bcd122b2268 100644
--- a/htdocs/includes/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/includes/modules/societe/mod_codecompta_digitaria.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  \file       htdocs/includes/modules/societe/mod_codecompta_digitaria.php
  \ingroup    societe
  \brief      Fichier de la classe des gestion digitaria des codes compta des societes clientes
- \version    $Id: mod_codecompta_digitaria.php,v 1.8 2011/07/31 23:28:14 eldy Exp $
+ \version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
diff --git a/htdocs/includes/modules/societe/mod_codecompta_panicum.php b/htdocs/includes/modules/societe/mod_codecompta_panicum.php
index ea8a5ff5092..394d1b1333c 100644
--- a/htdocs/includes/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/includes/modules/societe/mod_codecompta_panicum.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *      \file       htdocs/includes/modules/societe/mod_codecompta_panicum.php
  *      \ingroup    societe
  *      \brief      Fichier de la classe des gestion panicum des codes compta des societes clientes
- *      \version    $Id: mod_codecompta_panicum.php,v 1.8 2011/07/31 23:28:14 eldy Exp $
+ *      \version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
 
diff --git a/htdocs/includes/modules/societe/modules_societe.class.php b/htdocs/includes/modules/societe/modules_societe.class.php
index 4986daba8d2..02a0df5847b 100644
--- a/htdocs/includes/modules/societe/modules_societe.class.php
+++ b/htdocs/includes/modules/societe/modules_societe.class.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *	    \file       htdocs/includes/modules/societe/modules_societe.class.php
  *		\ingroup    societe
  *		\brief      Fichier contenant la classe mere de module de generation societes
- *		\version    $Id: modules_societe.class.php,v 1.28 2011/07/31 23:28:14 eldy Exp $
+ *		\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT."/core/class/commondocgenerator.class.php");
 
diff --git a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
index 2f9394d2c52..9c78596cee1 100755
--- a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *		\file       htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
  *      \ingroup    facture fourniseur
  *      \brief      File that contain parent class for supplier invoices models
- *      \version    $Id: modules_facturefournisseur.php,v 1.9 2011/07/31 23:28:18 eldy Exp $
+ *      \version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
diff --git a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 91e94490f7c..3fdb683e06f 100755
--- a/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\file       htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
  *	\ingroup    fournisseur
  *	\brief      Class file to generate the supplier invoices with the canelle model
- *	\version    $Id: pdf_canelle.modules.php,v 1.35 2011/07/31 23:28:18 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_invoice/modules_facturefournisseur.php");
diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php
index cb8af845411..f9f4a16db5e 100644
--- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *    	\file       htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php
  *		\ingroup    commande
  *		\brief      Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Muguet
- *		\version    $Id: mod_commande_fournisseur_muguet.php,v 1.8 2011/07/31 23:28:17 eldy Exp $
+ *		\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/supplier_order/modules_commandefournisseur.php");
diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index c0d09c2ca29..7a5e68670dc 100644
--- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *	\file       htdocs/includes/modules/supplier_order/mod_commande_fournisseur_orchidee.php
  *	\ingroup    commande
  *	\brief      Fichier contenant la classe du modele de numerotation de reference de commande fournisseur Orchidee
- *	\version    $Id: mod_commande_fournisseur_orchidee.php,v 1.9 2011/07/31 23:28:17 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/includes/modules/supplier_order/modules_commandefournisseur.php");
diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
index a4e39b8a906..5bace6adcdb 100644
--- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
@@ -17,7 +17,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -26,7 +27,7 @@
  *      \ingroup    commande
  *      \brief      File that contain parent class for supplier orders models
  *                  and parent class for supplier orders numbering models
- *      \version    $Id: modules_commandefournisseur.php,v 1.22 2011/07/31 23:28:17 eldy Exp $
+ *      \version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 require_once(DOL_DOCUMENT_ROOT.'/includes/fpdf/fpdfi/fpdi_protection.php');
diff --git a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
index d856f6eb4d8..ed520033d75 100644
--- a/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *	\file       htdocs/includes/modules/supplier_order/pdf/pdf_muscadet.modules.php
  *	\ingroup    fournisseur
  *	\brief      Fichier de la classe permettant de generer les commandes fournisseurs au modele Muscadet
- *	\version    $Id: pdf_muscadet.modules.php,v 1.87 2011/07/31 23:28:13 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/supplier_order/modules_commandefournisseur.php");
diff --git a/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN b/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN
index 998fa45b7a0..9ebf230b874 100644
--- a/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN
+++ b/htdocs/includes/triggers/interface_all_Demo.class.php-NORUN
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
@@ -27,7 +28,7 @@
  *                  - Le nom de la classe doit etre InterfaceMytrigger
  *                  - Le nom de la methode constructeur doit etre InterfaceMytrigger
  *                  - Le nom de la propriete name doit etre Mytrigger
- *		\version	$Id: interface_all_Demo.class.php-NORUN,v 1.30 2011/07/31 23:29:46 eldy Exp $
+ *		\version	$Id: interface_all_Demo.class.php-NORUN,v 1.29 2011/07/18 01:06:52 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/triggers/interface_all_Logevents.class.php b/htdocs/includes/triggers/interface_all_Logevents.class.php
index c0050318cb2..f6b93f30b91 100644
--- a/htdocs/includes/triggers/interface_all_Logevents.class.php
+++ b/htdocs/includes/triggers/interface_all_Logevents.class.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/includes/triggers/interface_all_Logevents.class.php
  *      \ingroup    core
  *      \brief      Trigger file for
- *		\version	$Id: interface_all_Logevents.class.php,v 1.23 2011/07/31 23:29:45 eldy Exp $
+ *		\version	$Id: interface_all_Logevents.class.php,v 1.22 2011/07/18 01:06:52 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
index de668c26a2a..5dced7f834f 100644
--- a/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
+++ b/htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
  *  \ingroup    agenda
  *  \brief      Trigger file for agenda module
- *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.36 2011/07/31 23:29:46 eldy Exp $
+ *	\version	$Id: interface_modAgenda_ActionsAuto.class.php,v 1.35 2011/07/18 01:06:52 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php b/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php
index db210aa2e33..2eddf0743b5 100644
--- a/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php
+++ b/htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/includes/triggers/interface_modLdap_Ldapsynchro.class.php
  *      \ingroup    core
  *      \brief      Fichier de gestion des triggers LDAP
- *		\version	$Id: interface_modLdap_Ldapsynchro.class.php,v 1.20 2011/07/31 23:29:46 eldy Exp $
+ *		\version	$Id: interface_modLdap_Ldapsynchro.class.php,v 1.19 2011/07/18 01:06:52 eldy Exp $
  */
 require_once (DOL_DOCUMENT_ROOT."/lib/ldap.class.php");
 
diff --git a/htdocs/includes/triggers/interface_modNotification_Notification.class.php b/htdocs/includes/triggers/interface_modNotification_Notification.class.php
index 175bee38fed..1beddcdd750 100644
--- a/htdocs/includes/triggers/interface_modNotification_Notification.class.php
+++ b/htdocs/includes/triggers/interface_modNotification_Notification.class.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/includes/triggers/interface_modNotification_Notification.class.php
  *      \ingroup    notification
  *      \brief      File of class of triggers for notification module
- *		\version	$Id: interface_modNotification_Notification.class.php,v 1.26 2011/07/31 23:29:45 eldy Exp $
+ *		\version	$Id: interface_modNotification_Notification.class.php,v 1.25 2011/07/18 01:06:52 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php b/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php
index 65091bd3338..5df064f29d1 100644
--- a/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php
+++ b/htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       /htdocs/includes/triggers/interface_modPaypal_PaypalWorkflow.class.php
  *      \ingroup    paypal
  *      \brief      Trigger file for paypal workflow
- *      \version	$Id: interface_modPaypal_PaypalWorkflow.class.php,v 1.8 2011/07/31 23:29:46 eldy Exp $
+ *      \version	$Id: interface_modPaypal_PaypalWorkflow.class.php,v 1.7 2011/07/08 15:43:54 eldy Exp $
  */
 
 
diff --git a/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php b/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php
index 61b21f3b761..c9adba34d05 100755
--- a/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/includes/triggers/interface_modWorkflow_WorkflowManager.class.php
  *      \ingroup    core
  *      \brief      Trigger file for workflows
- *      \version	$Id: interface_modWorkflow_WorkflowManager.class.php,v 1.8 2011/07/31 23:29:45 eldy Exp $
+ *      \version	$Id: interface_modWorkflow_WorkflowManager.class.php,v 1.7 2011/07/18 01:06:52 eldy Exp $
  */
 
 
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 9b19d9793fc..3724ef23d95 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -15,14 +15,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/install/check.php
  *	\ingroup    install
  *	\brief      Test if file conf can be modified and if does not exists, test if install process can create it
- *	\version    $Id: check.php,v 1.87 2011/07/31 23:26:19 eldy Exp $
+ *	\version    $Id: check.php,v 1.86 2011/07/30 14:56:43 eldy Exp $
  */
 include_once("./inc.php");
 
diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php
index 737e16cc10c..20ef1080e85 100644
--- a/htdocs/install/etape0.php
+++ b/htdocs/install/etape0.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/install/etape0.php
  *	\ingroup	install
  *	\brief      Show and ask charset for database
- *	\version    $Id: etape0.php,v 1.42 2011/07/31 23:26:25 eldy Exp $
+ *	\version    $Id: etape0.php,v 1.41 2011/07/30 14:56:43 eldy Exp $
  */
 
 define('DONOTLOADCONF',1);	// To avoid loading conf by file inc.php
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index c9713870c22..5d7fca530f2 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -16,14 +16,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\file       htdocs/install/etape1.php
  *		\ingroup	install
  *		\brief      Build conf file on disk
- *		\version    $Id: etape1.php,v 1.136 2011/07/31 23:26:18 eldy Exp $
+ *		\version    $Id: etape1.php,v 1.135 2011/07/30 14:56:42 eldy Exp $
  */
 
 define('DONOTLOADCONF',1);	// To avoid loading conf by file inc.php
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index e7b45a476f1..d7df4ac6929 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/install/etape2.php
  *		\ingroup	install
  *      \brief      Create tables, primary keys, foreign keys, indexes and functions into database and then load reference data
- *      \version    $Id: etape2.php,v 1.106 2011/07/31 23:26:19 eldy Exp $
+ *      \version    $Id: etape2.php,v 1.105 2011/07/30 14:56:43 eldy Exp $
  */
 
 include("./inc.php");
diff --git a/htdocs/install/etape4.php b/htdocs/install/etape4.php
index 62e0a4a90cf..9a0dd0fcc43 100644
--- a/htdocs/install/etape4.php
+++ b/htdocs/install/etape4.php
@@ -15,14 +15,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/install/etape4.php
  *	\ingroup	install
  *	\brief      Ask login and password of Dolibarr admin user
- *	\version    $Id: etape4.php,v 1.38 2011/07/31 23:26:26 eldy Exp $
+ *	\version    $Id: etape4.php,v 1.37 2011/07/30 14:56:43 eldy Exp $
  */
 
 
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 50fa9904890..0037190af06 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -16,14 +16,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *       \file      htdocs/install/etape5.php
  *	 	 \ingroup	install
  *       \brief     Last page of upgrade or install process
- *       \version   $Id: etape5.php,v 1.107 2011/07/31 23:26:19 eldy Exp $
+ *       \version   $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $
  */
 
 include_once("./inc.php");
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 2e0fccb0051..6d19b01e197 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -17,14 +17,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *       \file       htdocs/install/fileconf.php
  *       \ingroup    install
  *       \brief      Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page)
- *       \version    $Id: fileconf.php,v 1.94 2011/07/31 23:26:27 eldy Exp $
+ *       \version    $Id: fileconf.php,v 1.93 2011/07/30 14:56:43 eldy Exp $
  */
 include_once("./inc.php");
 
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 223a2eb6d92..3050d37833c 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -15,13 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**	    \file       htdocs/install/inc.php
  * 		\ingroup	core
  *		\brief      File that define environment for install pages
- *		\version    $Id: inc.php,v 1.137 2011/07/31 23:26:18 eldy Exp $
+ *		\version    $Id: inc.php,v 1.136 2011/07/30 10:23:25 eldy Exp $
  */
 
 define('DOL_VERSION','3.1.0-beta');	// Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
@@ -74,12 +75,10 @@ $conffiletoshowshort = "conf.php";
 # Define localization of conf file
 $conffile = "../conf/conf.php";
 $conffiletoshow = "htdocs/conf/conf.php";
-$lockfile = '../../install.lock';
-# For debian/redhat like systems
+# For debian like systems
 #$conffile = "/etc/dolibarr/conf.php";
 #$conffiletoshow = "/etc/dolibarr/conf.php";
-#$lockfile = '/etc/dolibarr/install.lock';    # Web has no permission to write here
-$lockfile = '../../install.lock';
+
 
 if (! defined('DONOTLOADCONF') && file_exists($conffile))
 {
@@ -179,7 +178,7 @@ if (preg_match('/install.lock/i',$_SERVER["SCRIPT_FILENAME"]))
     }
 	exit;
 }
-if (file_exists($lockfile))
+if (file_exists('../../install.lock'))
 {
 	print 'Install pages have been disabled for security reason (by lock file install.lock into dolibarr root directory).<br>';
 	if (! empty($dolibarr_main_url_root))
diff --git a/htdocs/install/index.php b/htdocs/install/index.php
index 024da4b7c0e..8153812b284 100644
--- a/htdocs/install/index.php
+++ b/htdocs/install/index.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
@@ -21,7 +22,7 @@
  *       \ingroup    install
  *       \brief      Affichage page selection langue si premiere install.
  *					 Si reinstall, passe directement a la page check.php
- *       \version    $Id: index.php,v 1.36 2011/07/31 23:26:19 eldy Exp $
+ *       \version    $Id$
  */
 include_once("./inc.php");
 include_once("../core/class/html.form.class.php");
diff --git a/htdocs/install/licence.php b/htdocs/install/licence.php
index 841136fff8b..c786f91346c 100644
--- a/htdocs/install/licence.php
+++ b/htdocs/install/licence.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	 \file       htdocs/install/licence.php
  *   \ingroup    install
  *	 \brief      Page to show licence (Removed from install process to save time)
- *	 \version    $Id: licence.php,v 1.21 2011/07/31 23:26:22 eldy Exp $
+ *	 \version    $Id: licence.php,v 1.20 2011/07/30 14:56:42 eldy Exp $
  */
 
 include_once("./inc.php");
diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index 1f046a29bc4..1c43326d70f 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -21,7 +21,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id: llx_10_c_regions.sql,v 1.13 2011/07/31 12:31:00 eldy Exp $
+-- $Id: llx_10_c_regions.sql,v 1.12 2011/07/28 18:34:46 eldy Exp $
 --
 
 --
@@ -158,21 +158,21 @@ insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, act
 insert into llx_c_regions (rowid, fk_pays, code_region, cheflieu, tncc, nom, active) values (7001,  70, 7001, '', 0, 'Colombie', 1);
 
 -- Regions Chile (id country=67)
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 6701, 67, NULL, NULL, 'Tarapacá', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 6702, 67, NULL, NULL, 'Antofagasta', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 6703, 67, NULL, NULL, 'Atacama', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 6704, 67, NULL, NULL, 'Coquimbo', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 6705, 67, NULL, NULL, 'Valparaíso', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 6706, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 6707, 67, NULL, NULL, 'Maule', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 6708, 67, NULL, NULL, 'Biobío', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 6709, 67, NULL, NULL, 'Raucanía', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 6710, 67, NULL, NULL, 'Los Lagos', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 6711, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 6712, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 6713, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 6714, 67, NULL, NULL, 'Los Ríos', 1);
-INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 6715, 67, NULL, NULL, 'Arica y Parinacota', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6701, 01, 67, NULL, NULL, 'Tarapacá', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6702, 02, 67, NULL, NULL, 'Antofagasta', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6703, 03, 67, NULL, NULL, 'Atacama', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6704, 04, 67, NULL, NULL, 'Coquimbo', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6705, 05, 67, NULL, NULL, 'Valparaíso', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6706, 06, 67, NULL, NULL, 'General Bernardo O Higgins', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6707, 07, 67, NULL, NULL, 'Maule', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6708, 08, 67, NULL, NULL, 'Biobío', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6709, 09, 67, NULL, NULL, 'Raucanía', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6710, 10, 67, NULL, NULL, 'Los Lagos', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6711, 11, 67, NULL, NULL, 'Aysén General Carlos Ibáñez del Campo', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6712, 12, 67, NULL, NULL, 'Magallanes y Antártica Chilena', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6713, 13, 67, NULL, NULL, 'Metropolitana de Santiago', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6714, 14, 67, NULL, NULL, 'Los Ríos', 1);
+INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (6715, 15, 67, NULL, NULL, 'Arica y Parinacota', 1);
 
 -- Regions San Salvador (id country=86)
 INSERT INTO llx_c_regions (rowid, code_region, fk_pays, cheflieu, tncc, nom, active) VALUES (8601, 8601, 86, NULL, NULL, 'Central', 1);
diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 9a109ab3fdc..e3963e8e68f 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -21,7 +21,7 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 --
--- $Id: llx_20_c_departements.sql,v 1.15 2011/07/31 12:31:00 eldy Exp $
+-- $Id: llx_20_c_departements.sql,v 1.14 2011/07/28 18:34:46 eldy Exp $
 --
 
 --
@@ -566,6 +566,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('OAX', 15401, '', 0, 'OAX', 'Oaxaca', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('PUE', 15401, '', 0, 'PUE', 'Puebla', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('QRO', 15401, '', 0, 'QRO', 'Querétaro', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('HGO', 15401, '', 0, 'HGO', 'Hidalgo', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('ROO', 15401, '', 0, 'ROO', 'Quintana Roo', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SLP', 15401, '', 0, 'SLP', 'San Luis Potosí', 1);
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SIN', 15401, '', 0, 'SIN', 'Sinaloa', 1);
diff --git a/htdocs/install/phpinfo.php b/htdocs/install/phpinfo.php
index dbf19ec25ae..731c2361f63 100644
--- a/htdocs/install/phpinfo.php
+++ b/htdocs/install/phpinfo.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
         \file       htdocs/install/phpinfo.php
         \ingroup    install
         \brief      Affichage page phpinfo
-        \version    $Id: phpinfo.php,v 1.4 2011/07/31 23:26:18 eldy Exp $
+        \version    $Id$
 */
 
 phpinfo();
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 7d3e0e5c73a..15513fa782a 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\file       htdocs/install/repair.php
  *      \brief      Run repair script
- *      \version    $Id: repair.php,v 1.11 2011/07/31 23:26:24 eldy Exp $
+ *      \version    $Id$
  */
 
 include_once("./inc.php");
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 58e0bf1bc0f..2c68f71604a 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\file       htdocs/install/upgrade.php
  *      \brief      Run migration script
- *      \version    $Id: upgrade.php,v 1.74 2011/07/31 23:26:22 eldy Exp $
+ *      \version    $Id$
  */
 
 include_once("./inc.php");
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 9c4c3b41812..b588fe56702 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -15,13 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/install/upgrade2.php
  *	\brief      Upgrade some data
- *	\version    $Id: upgrade2.php,v 1.187 2011/07/31 23:26:18 eldy Exp $
+ *	\version    $Id: upgrade2.php,v 1.186 2011/07/28 15:30:27 eldy Exp $
  */
 
 include_once('./inc.php');
diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php
index eedf4ec7d87..8dda1a9d93b 100644
--- a/htdocs/lib/CMailFile.class.php
+++ b/htdocs/lib/CMailFile.class.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  *
  * Lots of code inspired from Dan Potter's CMailFile class
@@ -24,7 +25,7 @@
 /**
  *      \file       htdocs/lib/CMailFile.class.php
  *      \brief      File of class to send emails (with attachments or not)
- *		\version    $Id: CMailFile.class.php,v 1.148 2011/07/31 23:25:43 eldy Exp $
+ *		\version    $Id: CMailFile.class.php,v 1.147 2011/07/20 13:01:03 eldy Exp $
  *      \author     Dan Potter.
  *      \author	    Eric Seigne
  *      \author	    Laurent Destailleur.
diff --git a/htdocs/lib/CSMSFile.class.php b/htdocs/lib/CSMSFile.class.php
index 1ac2edcb54a..4a78dcddf72 100755
--- a/htdocs/lib/CSMSFile.class.php
+++ b/htdocs/lib/CSMSFile.class.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  *
  * Lots of code inspired from Dan Potter's CSMSFile class
@@ -24,7 +25,7 @@
 /**
  *      \file       htdocs/lib/CSMSFile.class.php
  *      \brief      File of class to send sms
- *		\version    $Id: CSMSFile.class.php,v 1.6 2011/07/31 23:25:22 eldy Exp $
+ *		\version    $Id: CSMSFile.class.php,v 1.5 2011/07/07 22:17:21 eldy Exp $
  *      \author	    Laurent Destailleur.
  */
 
diff --git a/htdocs/lib/accountancy.lib.php b/htdocs/lib/accountancy.lib.php
index 17ebf316f9a..6ef49c8af6a 100644
--- a/htdocs/lib/accountancy.lib.php
+++ b/htdocs/lib/accountancy.lib.php
@@ -13,13 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file			htdocs/lib/accountancy.lib.php
  *  \brief			Library of accountancy functions
- * 	\version		$Id: accountancy.lib.php,v 1.3 2011/07/31 23:25:31 eldy Exp $
+ * 	\version		$Id: accountancy.lib.php,v 1.2 2011/07/04 10:30:01 eldy Exp $
  */
 
 /**
diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php
index c2d47f668da..ff6f9d92e55 100644
--- a/htdocs/lib/admin.lib.php
+++ b/htdocs/lib/admin.lib.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *	\file			htdocs/lib/admin.lib.php
  *  \brief			Library of admin functions
- *  \version		$Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $
+ *  \version		$Id: admin.lib.php,v 1.97 2011/07/17 18:13:44 eldy Exp $
  */
 
 
@@ -467,7 +468,7 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not
 /**
  *  \brief      	Define head array for tabs of security setup pages
  *  \return			Array of head
- *  \version    	$Id: admin.lib.php,v 1.98 2011/07/31 23:25:40 eldy Exp $
+ *  \version    	$Id: admin.lib.php,v 1.97 2011/07/17 18:13:44 eldy Exp $
  */
 function security_prepare_head()
 {
diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php
index 029959a620c..d47b327541d 100644
--- a/htdocs/lib/agenda.lib.php
+++ b/htdocs/lib/agenda.lib.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/lib/agenda.lib.php
  *  \brief		Set of function for the agenda module
- *  \version	$Id: agenda.lib.php,v 1.43 2011/07/31 23:25:33 eldy Exp $
+ *  \version	$Id: agenda.lib.php,v 1.42 2011/07/22 06:51:30 simnandez Exp $
  */
 
 
diff --git a/htdocs/lib/ajax.lib.php b/htdocs/lib/ajax.lib.php
index 55def736688..7db1908bc49 100644
--- a/htdocs/lib/ajax.lib.php
+++ b/htdocs/lib/ajax.lib.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/lib/ajax.lib.php
  *  \brief		Page called by Ajax request for produts
- *  \version	$Id: ajax.lib.php,v 1.60 2011/07/31 23:25:18 eldy Exp $
+ *  \version	$Id: ajax.lib.php,v 1.59 2011/07/28 18:57:23 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/antispamimage.php b/htdocs/lib/antispamimage.php
index 73d12265ab2..dbf736fd561 100644
--- a/htdocs/lib/antispamimage.php
+++ b/htdocs/lib/antispamimage.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *		\file       htdocs/lib/antispamimage.php
  *		\brief      Return antispam image
- *		\version    $Id: antispamimage.php,v 1.16 2011/07/31 23:25:15 eldy Exp $
+ *		\version    $Id$
  */
 
 define('NOLOGIN',1);
diff --git a/htdocs/lib/antivir.class.php b/htdocs/lib/antivir.class.php
index f0a19cd0a9f..692591582b8 100644
--- a/htdocs/lib/antivir.class.php
+++ b/htdocs/lib/antivir.class.php
@@ -15,14 +15,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *      \file       htdocs/lib/antivir.class.php
  *      \brief      File of class to scan viruses
- *		\version    $Id: antivir.class.php,v 1.8 2011/07/31 23:25:40 eldy Exp $
+ *		\version    $Id$
  *      \author	    Laurent Destailleur.
  */
 
diff --git a/htdocs/lib/bank.lib.php b/htdocs/lib/bank.lib.php
index b98da9b9e98..5374d9b964b 100644
--- a/htdocs/lib/bank.lib.php
+++ b/htdocs/lib/bank.lib.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
 	    \file       htdocs/lib/bank.lib.php
 		\brief      Ensemble de fonctions de base pour le module banque
         \ingroup    banque
-        \version    $Id: bank.lib.php,v 1.14 2011/07/31 23:25:13 eldy Exp $
+        \version    $Id$
 
 		Ensemble de fonctions de base de dolibarr sous forme d'include
 */
diff --git a/htdocs/lib/bookmark.lib.php b/htdocs/lib/bookmark.lib.php
index fa60813c577..710dad92b21 100644
--- a/htdocs/lib/bookmark.lib.php
+++ b/htdocs/lib/bookmark.lib.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *	    \file       htdocs/lib/bookmark.lib.php
  *		\brief      List of functions for bookmark module
- *		\version    $Id: bookmark.lib.php,v 1.6 2011/07/31 23:25:41 eldy Exp $
+ *		\version    $Id$
  *
  *		Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/categories.lib.php b/htdocs/lib/categories.lib.php
index e5b99b328d7..e3d99f899b6 100644
--- a/htdocs/lib/categories.lib.php
+++ b/htdocs/lib/categories.lib.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *	\file       htdocs/lib/categories.lib.php
  *	\brief      Ensemble de fonctions de base pour le module categorie
  *	\ingroup    categorie
- *	\version    $Id: categories.lib.php,v 1.2 2011/07/31 23:26:02 eldy Exp $
+ *	\version    $Id$
  *
  * 	Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php
index 08da9d4e6ec..91fe7bfcfad 100644
--- a/htdocs/lib/company.lib.php
+++ b/htdocs/lib/company.lib.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *	\file       htdocs/lib/company.lib.php
  *	\brief      Ensemble de fonctions de base pour le module societe
  *	\ingroup    societe
- *	\version    $Id: company.lib.php,v 1.123 2011/07/31 23:25:41 eldy Exp $
+ *	\version    $Id: company.lib.php,v 1.122 2011/07/04 08:38:51 eldy Exp $
  */
 
 /**
diff --git a/htdocs/lib/contact.lib.php b/htdocs/lib/contact.lib.php
index 41b8a344540..5f711e11a97 100644
--- a/htdocs/lib/contact.lib.php
+++ b/htdocs/lib/contact.lib.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *	    \file       htdocs/lib/contact.lib.php
  *		\brief      Ensemble de fonctions de base pour les contacts
- *		\version    $Id: contact.lib.php,v 1.10 2011/07/31 23:25:22 eldy Exp $
+ *		\version    $Id$
  *
  *		Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/contract.lib.php b/htdocs/lib/contract.lib.php
index 88d45e2305e..023e28b4303 100644
--- a/htdocs/lib/contract.lib.php
+++ b/htdocs/lib/contract.lib.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
 	    \file       htdocs/lib/contract.lib.php
 		\brief      Ensemble de fonctions de base pour le module contrat
-		\version    $Id: contract.lib.php,v 1.9 2011/07/31 23:25:21 eldy Exp $
+		\version    $Id$
 */
 
 function contract_prepare_head($object)
diff --git a/htdocs/lib/databases/mssql.lib.php b/htdocs/lib/databases/mssql.lib.php
index 9328e2cb852..3bc42a1fa4a 100644
--- a/htdocs/lib/databases/mssql.lib.php
+++ b/htdocs/lib/databases/mssql.lib.php
@@ -15,13 +15,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       	htdocs/lib/databases/mssql.lib.php
  *	\brief			Fichier de la classe permettant de gerer une base mssql
- *	\version		$Id: mssql.lib.php,v 1.86 2011/07/31 23:26:03 eldy Exp $
+ *	\version		$Id$
  */
 
 // Pour compatibilite lors de l'upgrade
diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php
index bccac28c77e..66f7c8e7661 100644
--- a/htdocs/lib/databases/mysql.lib.php
+++ b/htdocs/lib/databases/mysql.lib.php
@@ -16,13 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       	htdocs/lib/databases/mysql.lib.php
  *	\brief      	Class file to manage Dolibarr database access for a Mysql database
- *	\version		$Id: mysql.lib.php,v 1.119 2011/07/31 23:26:03 eldy Exp $
+ *	\version		$Id$
  */
 // For compatibility during upgrade
 if (! defined('DOL_DOCUMENT_ROOT'))	 define('DOL_DOCUMENT_ROOT', '../..');
diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php
index 7aaba18459e..36ab4c73646 100644
--- a/htdocs/lib/databases/mysqli.lib.php
+++ b/htdocs/lib/databases/mysqli.lib.php
@@ -16,13 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/lib/databases/mysqli.lib.php
  *	\brief      Class file to manage Dolibarr database access for a Mysql database
- *	\version	$Id: mysqli.lib.php,v 1.113 2011/07/31 23:26:03 eldy Exp $
+ *	\version	$Id$
  */
 
 // For compatibility during upgrade
diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php
index 4e1a249b429..4a6e7947683 100644
--- a/htdocs/lib/databases/pgsql.lib.php
+++ b/htdocs/lib/databases/pgsql.lib.php
@@ -17,13 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/lib/databases/pgsql.lib.php
  *	\brief      Fichier de la classe permettant de gerer une base pgsql
- *	\version	$Id: pgsql.lib.php,v 1.110 2011/07/31 23:26:03 eldy Exp $
+ *	\version	$Id: pgsql.lib.php,v 1.109 2011/07/04 07:36:30 eldy Exp $
  */
 // For compatibility during upgrade
 if (! defined('DOL_DOCUMENT_ROOT'))	 define('DOL_DOCUMENT_ROOT', '../..');
diff --git a/htdocs/lib/date.lib.php b/htdocs/lib/date.lib.php
index 5d05a731342..36f8669a8db 100644
--- a/htdocs/lib/date.lib.php
+++ b/htdocs/lib/date.lib.php
@@ -14,14 +14,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/lib/date.lib.php
  *  \brief		Set of function to manipulate dates
- *  \version	$Id: date.lib.php,v 1.33 2011/07/31 23:25:42 eldy Exp $
+ *  \version	$Id: date.lib.php,v 1.32 2011/07/04 08:38:51 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/datepicker.php b/htdocs/lib/datepicker.php
index 54d6446ca07..3988c2d4ce1 100644
--- a/htdocs/lib/datepicker.php
+++ b/htdocs/lib/datepicker.php
@@ -17,13 +17,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *       \file       htdocs/lib/datepicker.php
  *       \brief      Fichier de gestion de la popup de selection de date eldy
- *       \version    $Id: datepicker.php,v 1.32 2011/07/31 23:25:29 eldy Exp $
+ *       \version    $Id$
  */
 
 if (! defined('NOREQUIREUSER'))   define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
diff --git a/htdocs/lib/doleditor.class.php b/htdocs/lib/doleditor.class.php
index 0544b840a11..73c19b621f6 100644
--- a/htdocs/lib/doleditor.class.php
+++ b/htdocs/lib/doleditor.class.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *       \file       htdocs/lib/doleditor.class.php
  *       \brief      Class to manage a WYSIWYG editor
- *       \version    $Id: doleditor.class.php,v 1.45 2011/07/31 23:26:01 eldy Exp $
+ *       \version    $Id: doleditor.class.php,v 1.44 2011/07/06 12:45:36 eldy Exp $
  */
 
 /**
diff --git a/htdocs/lib/dolgeoip.class.php b/htdocs/lib/dolgeoip.class.php
index 4ae62e7d418..811b7e2f41f 100644
--- a/htdocs/lib/dolgeoip.class.php
+++ b/htdocs/lib/dolgeoip.class.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *  \file		htdocs/lib/dolgeoip.class.php
  * 	\ingroup	geoip
  *  \brief		Library for managing module geoip
- *  \version	$Id: dolgeoip.class.php,v 1.5 2011/07/31 23:26:01 eldy Exp $
+ *  \version	$Id$
  */
 
 
diff --git a/htdocs/lib/doxygen.php b/htdocs/lib/doxygen.php
index 0fefe2032fd..2df7d35d9fe 100644
--- a/htdocs/lib/doxygen.php
+++ b/htdocs/lib/doxygen.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
diff --git a/htdocs/lib/ecm.lib.php b/htdocs/lib/ecm.lib.php
index 6ef5d7ad4fb..8af11f09d53 100644
--- a/htdocs/lib/ecm.lib.php
+++ b/htdocs/lib/ecm.lib.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *  \file       htdocs/lib/ecm.lib.php
  *  \brief      Ensemble de fonctions de base pour le module ecm
  *  \ingroup    ecm
- *  \version    $Id: ecm.lib.php,v 1.5 2011/07/31 23:25:21 eldy Exp $
+ *  \version    $Id$
  */
 
 
diff --git a/htdocs/lib/emailing.lib.php b/htdocs/lib/emailing.lib.php
index aca6edde708..888cd4d21ee 100644
--- a/htdocs/lib/emailing.lib.php
+++ b/htdocs/lib/emailing.lib.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *	    \file       htdocs/lib/emailing.lib.php
  *		\brief      Library file with function for emailing module
- *		\version    $Id: emailing.lib.php,v 1.3 2011/07/31 23:25:32 eldy Exp $
+ *		\version    $Id$
  */
 
 /**
diff --git a/htdocs/lib/fichinter.lib.php b/htdocs/lib/fichinter.lib.php
index 69a875f7ab7..065bf7b6664 100644
--- a/htdocs/lib/fichinter.lib.php
+++ b/htdocs/lib/fichinter.lib.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\file       htdocs/lib/fichinter.lib.php
  *	\brief      Ensemble de fonctions de base pour le module fichinter
  *	\ingroup    fichinter
- *	\version    $Id: fichinter.lib.php,v 1.15 2011/07/31 23:25:17 eldy Exp $
+ *	\version    $Id$
  *
  * 	Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index 312cece614e..95fb3e6adb0 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/lib/files.lib.php
  *  \brief		Library for file managing functions
- *  \version	$Id: files.lib.php,v 1.71 2011/07/31 23:25:43 eldy Exp $
+ *  \version	$Id: files.lib.php,v 1.70 2011/07/14 05:21:53 hregis Exp $
  */
 
 /**
diff --git a/htdocs/lib/format_cards.lib.php b/htdocs/lib/format_cards.lib.php
index 80312414d70..6754416659e 100644
--- a/htdocs/lib/format_cards.lib.php
+++ b/htdocs/lib/format_cards.lib.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *	\file       htdocs/lib/format_cards.lib.php
  *	\brief      Set of functions used for cards generation
  *	\ingroup    core
- *	\version    $Id: format_cards.lib.php,v 1.2 2011/07/31 23:25:32 eldy Exp $
+ *	\version    $Id$
  */
 
 
diff --git a/htdocs/lib/fourn.lib.php b/htdocs/lib/fourn.lib.php
index 2bfce40be69..11aede51cc7 100644
--- a/htdocs/lib/fourn.lib.php
+++ b/htdocs/lib/fourn.lib.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *	    \file       htdocs/lib/fourn.lib.php
  *		\brief      Ensemble de fonctions de base pour le module fournisseur
- *		\version    $Id: fourn.lib.php,v 1.21 2011/07/31 23:25:25 eldy Exp $
+ *		\version    $Id$
  */
 
 function facturefourn_prepare_head($object)
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 2209b8777e3..bc023bef077 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -20,7 +20,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -28,7 +29,7 @@
  *	\file			htdocs/lib/functions.lib.php
  *	\brief			A set of functions for Dolibarr
  *					This file contains all frequently used functions.
- *	\version		$Id: functions.lib.php,v 1.549 2011/07/31 23:25:25 eldy Exp $
+ *	\version		$Id: functions.lib.php,v 1.548 2011/07/18 03:49:10 eldy Exp $
  */
 
 // For compatibility during upgrade
diff --git a/htdocs/lib/functions2.lib.php b/htdocs/lib/functions2.lib.php
index ef9875dc6d3..57b891e00ee 100644
--- a/htdocs/lib/functions2.lib.php
+++ b/htdocs/lib/functions2.lib.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\file			htdocs/lib/functions2.lib.php
  *	\brief			A set of functions for Dolibarr
  *					This file contains all rare functions.
- *	\version		$Id: functions2.lib.php,v 1.76 2011/07/31 23:26:00 eldy Exp $
+ *	\version		$Id: functions2.lib.php,v 1.75 2011/07/04 08:38:51 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/functions_ch.lib.php b/htdocs/lib/functions_ch.lib.php
index b68357ced57..dffa7910e21 100644
--- a/htdocs/lib/functions_ch.lib.php
+++ b/htdocs/lib/functions_ch.lib.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *	\file			htdocs/lib/functions_ch.lib.php
  *	\brief			A set of swiss functions for Dolibarr
  *					This file contains rare functions.
- *	\version		$Id: functions_ch.lib.php,v 1.4 2011/07/31 23:25:34 eldy Exp $
+ *	\version		$Id: functions_ch.lib.php,v 1.3 2011/07/04 08:38:51 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/google.class.php b/htdocs/lib/google.class.php
index a964defadfb..08520dc84af 100644
--- a/htdocs/lib/google.class.php
+++ b/htdocs/lib/google.class.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *	\file			htdocs/lib/google.class.php
  *	\brief			A set of functions for using Google APIs
- *	\version		$Id: google.class.php,v 1.3 2011/07/31 23:25:23 eldy Exp $
+ *	\version		$Id$
  */
 class GoogleAPI
 {
diff --git a/htdocs/lib/images.lib.php b/htdocs/lib/images.lib.php
index b51e26a75a6..f561fd772fb 100644
--- a/htdocs/lib/images.lib.php
+++ b/htdocs/lib/images.lib.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/lib/images.lib.php
  *  \brief		Set of function for manipulating images
- * 	\version	$Id: images.lib.php,v 1.24 2011/07/31 23:26:02 eldy Exp $
+ * 	\version	$Id: images.lib.php,v 1.23 2011/07/05 22:51:24 eldy Exp $
  */
 
 // Define size of logo small and mini
diff --git a/htdocs/lib/invoice.lib.php b/htdocs/lib/invoice.lib.php
index 04fb81094c5..135c1d868b9 100644
--- a/htdocs/lib/invoice.lib.php
+++ b/htdocs/lib/invoice.lib.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
  *	    \file       htdocs/lib/invoice.lib.php
  *		\brief      Ensemble de fonctions de base pour le module factures
  * 		\ingroup	invoice
- *		\version    $Id: invoice.lib.php,v 1.15 2011/07/31 23:25:41 eldy Exp $ *
+ *		\version    $Id$ *
  *
  *		Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/ldap.class.php b/htdocs/lib/ldap.class.php
index 42ba2e68a86..d9facdb386b 100644
--- a/htdocs/lib/ldap.class.php
+++ b/htdocs/lib/ldap.class.php
@@ -15,14 +15,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *	\file 		htdocs/lib/ldap.class.php
  *	\brief 		File of class to manage LDAP features
- *	\version 	$Id: ldap.class.php,v 1.77 2011/07/31 23:25:43 eldy Exp $
+ *	\version 	$Id$
  */
 
 /**
diff --git a/htdocs/lib/ldap.lib.php b/htdocs/lib/ldap.lib.php
index 88e68f66eba..514ecdd3518 100644
--- a/htdocs/lib/ldap.lib.php
+++ b/htdocs/lib/ldap.lib.php
@@ -12,7 +12,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -20,7 +21,7 @@
 	    \file       htdocs/lib/ldap.lib.php
 		\brief      Ensemble de fonctions de base pour le module LDAP
         \ingroup    ldap
-        \version    $Id: ldap.lib.php,v 1.49 2011/07/31 23:25:35 eldy Exp $
+        \version    $Id$
 
 		Ensemble de fonctions de base de dolibarr sous forme d'include
 */
diff --git a/htdocs/lib/member.lib.php b/htdocs/lib/member.lib.php
index 2a0ece56671..74257f9e4e0 100644
--- a/htdocs/lib/member.lib.php
+++ b/htdocs/lib/member.lib.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *	    \file       htdocs/lib/member.lib.php
  *		\brief      Ensemble de fonctions de base pour les adherents
- *		\version    $Id: member.lib.php,v 1.25 2011/07/31 23:26:02 eldy Exp $
+ *		\version    $Id: member.lib.php,v 1.24 2011/07/03 16:00:19 eldy Exp $
  *
  *		Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/memory.lib.php b/htdocs/lib/memory.lib.php
index 49d7f5ff053..01f20c99df6 100644
--- a/htdocs/lib/memory.lib.php
+++ b/htdocs/lib/memory.lib.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/lib/memory.lib.php
  *  \brief		Set of function for memory/cache management
- *  \version	$Id: memory.lib.php,v 1.11 2011/07/31 23:25:11 eldy Exp $
+ *  \version	$Id$
  */
 
 global $shmkeys,$shmoffset;
diff --git a/htdocs/lib/order.lib.php b/htdocs/lib/order.lib.php
index 1c8bcd2e4d4..c29f345a5c9 100644
--- a/htdocs/lib/order.lib.php
+++ b/htdocs/lib/order.lib.php
@@ -15,7 +15,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -23,7 +24,7 @@
  *  \file       htdocs/lib/order.lib.php
  *  \brief      Ensemble de fonctions de base pour le module commande
  *  \ingroup    commande
- *  \version    $Id: order.lib.php,v 1.27 2011/07/31 23:25:41 eldy Exp $
+ *  \version    $Id$
  */
 
 function commande_prepare_head($object)
diff --git a/htdocs/lib/pdf.lib.php b/htdocs/lib/pdf.lib.php
index e2a33296bee..263e18df269 100644
--- a/htdocs/lib/pdf.lib.php
+++ b/htdocs/lib/pdf.lib.php
@@ -16,7 +16,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -24,7 +25,7 @@
  *	\file       htdocs/lib/pdf.lib.php
  *	\brief      Set of functions used for PDF generation
  *	\ingroup    core
- *	\version    $Id: pdf.lib.php,v 1.99 2011/07/31 23:25:42 eldy Exp $
+ *	\version    $Id: pdf.lib.php,v 1.98 2011/07/27 17:28:42 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/prelevement.lib.php b/htdocs/lib/prelevement.lib.php
index cdaa2f5c57f..617cb297697 100644
--- a/htdocs/lib/prelevement.lib.php
+++ b/htdocs/lib/prelevement.lib.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *	\file       htdocs/lib/prelevement.lib.php
  *	\brief      Ensemble de fonctions de base pour le module prelevement
  *	\ingroup    propal
- *	\version    $Id: prelevement.lib.php,v 1.9 2011/07/31 23:25:28 eldy Exp $
+ *	\version    $Id: prelevement.lib.php,v 1.8 2011/07/04 09:01:38 eldy Exp $
  *
  * 	Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/price.lib.php b/htdocs/lib/price.lib.php
index ff4110a3883..49e4eeb7ec8 100644
--- a/htdocs/lib/price.lib.php
+++ b/htdocs/lib/price.lib.php
@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\file 		htdocs/lib/price.lib.php
  *		\brief 		Librairie contenant les fonctions pour calculer un prix.
- *		\version 	$Id: price.lib.php,v 1.36 2011/07/31 23:26:01 eldy Exp $
+ *		\version 	$Id$
  */
 
 
diff --git a/htdocs/lib/product.lib.php b/htdocs/lib/product.lib.php
index 8b26ea66465..043c137e166 100644
--- a/htdocs/lib/product.lib.php
+++ b/htdocs/lib/product.lib.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *	\file       htdocs/lib/product.lib.php
  *	\brief      Ensemble de fonctions de base pour le module produit et service
  * 	\ingroup	product
- *	\version    $Id: product.lib.php,v 1.44 2011/07/31 23:25:32 eldy Exp $
+ *	\version    $Id: product.lib.php,v 1.43 2011/07/04 09:01:38 eldy Exp $
  *
  * 	Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/project.lib.php b/htdocs/lib/project.lib.php
index d3eef74bbe6..ce197938ea7 100644
--- a/htdocs/lib/project.lib.php
+++ b/htdocs/lib/project.lib.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *	    \file       htdocs/lib/project.lib.php
  *		\brief      Functions used by project module
  *      \ingroup    project
- *      \version    $Id: project.lib.php,v 1.70 2011/07/31 23:26:00 eldy Exp $
+ *      \version    $Id: project.lib.php,v 1.69 2011/07/14 15:37:37 simnandez Exp $
  */
 require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
 
@@ -98,7 +99,7 @@ function project_prepare_head($object)
  *	    \file       htdocs/lib/project.lib.php
  *		\brief      Ensemble de fonctions de base pour le module projet
  *      \ingroup    societe
- *      \version    $Id: project.lib.php,v 1.70 2011/07/31 23:26:00 eldy Exp $
+ *      \version    $Id: project.lib.php,v 1.69 2011/07/14 15:37:37 simnandez Exp $
  */
 function task_prepare_head($object)
 {
diff --git a/htdocs/lib/propal.lib.php b/htdocs/lib/propal.lib.php
index db310e8deaf..041c87e94c5 100644
--- a/htdocs/lib/propal.lib.php
+++ b/htdocs/lib/propal.lib.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
  *	\file       htdocs/lib/propal.lib.php
  *	\brief      Ensemble de fonctions de base pour le module propal
  *	\ingroup    propal
- *	\version    $Id: propal.lib.php,v 1.26 2011/07/31 23:25:42 eldy Exp $
+ *	\version    $Id$
  *
  * 	Ensemble de fonctions de base de dolibarr sous forme d'include
  */
diff --git a/htdocs/lib/report.lib.php b/htdocs/lib/report.lib.php
index 50b1a83c83c..e1f73204ab2 100644
--- a/htdocs/lib/report.lib.php
+++ b/htdocs/lib/report.lib.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file       	htdocs/lib/report.lib.php
  *  \brief      	Set of functions for reporting
- *  \version		$Id: report.lib.php,v 1.6 2011/07/31 23:25:39 eldy Exp $
+ *  \version		$Id$
  */
 
 
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index 4212cc12529..8c8a2331259 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file			htdocs/lib/security.lib.php
  *  \brief			Set of function used for dolibarr security
- *  \version		$Id: security.lib.php,v 1.125 2011/07/31 23:25:15 eldy Exp $
+ *  \version		$Id: security.lib.php,v 1.124 2011/07/09 08:05:08 hregis Exp $
  */
 
 
diff --git a/htdocs/lib/sendings.lib.php b/htdocs/lib/sendings.lib.php
index e75bcb1abc9..d41b1e81898 100644
--- a/htdocs/lib/sendings.lib.php
+++ b/htdocs/lib/sendings.lib.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/lib/sendings.lib.php
  *	\ingroup    expedition
  *	\brief      Library for expedition module
- *	\version    $Id: sendings.lib.php,v 1.25 2011/07/31 23:25:42 eldy Exp $
+ *	\version    $Id$
  */
 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/expedition/class/expedition.class.php");
diff --git a/htdocs/lib/stock.lib.php b/htdocs/lib/stock.lib.php
index 034e4b81352..e086652bbbf 100644
--- a/htdocs/lib/stock.lib.php
+++ b/htdocs/lib/stock.lib.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *	    \file       htdocs/lib/stock.lib.php
  *		\brief      Library file with function for stock module
- *		\version    $Id: stock.lib.php,v 1.8 2011/07/31 23:25:15 eldy Exp $
+ *		\version    $Id$
  */
 
 /**
diff --git a/htdocs/lib/tax.lib.php b/htdocs/lib/tax.lib.php
index eebca0ca1d7..82e5cad0bc2 100644
--- a/htdocs/lib/tax.lib.php
+++ b/htdocs/lib/tax.lib.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *      \file       htdocs/lib/tax.lib.php
  *      \ingroup    tax
  *      \brief      Library for tax module
- *      \version    $Id: tax.lib.php,v 1.22 2011/07/31 23:26:01 eldy Exp $
+ *      \version    $Id: tax.lib.php,v 1.21 2011/07/18 11:11:19 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/treeview.lib.php b/htdocs/lib/treeview.lib.php
index bcdfd54592c..736f309ddc0 100644
--- a/htdocs/lib/treeview.lib.php
+++ b/htdocs/lib/treeview.lib.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *  \file       htdocs/lib/treeview.lib.php
  *  \ingroup    core
  *  \brief      Libraries for tree views
- *  \version    $Id: treeview.lib.php,v 1.13 2011/07/31 23:25:41 eldy Exp $
+ *  \version    $Id: treeview.lib.php,v 1.12 2011/07/04 09:01:38 eldy Exp $
  */
 
 
diff --git a/htdocs/lib/usergroups.lib.php b/htdocs/lib/usergroups.lib.php
index d9c4b5a542f..1521cc75921 100644
--- a/htdocs/lib/usergroups.lib.php
+++ b/htdocs/lib/usergroups.lib.php
@@ -13,7 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -21,7 +22,7 @@
 /**
  *	    \file       htdocs/lib/usergroups.lib.php
  *		\brief      Ensemble de fonctions de base pour la gestion des utilisaterus et groupes
- *		\version    $Id: usergroups.lib.php,v 1.30 2011/07/31 23:25:25 eldy Exp $
+ *		\version    $Id: usergroups.lib.php,v 1.29 2011/07/18 23:35:06 eldy Exp $
  */
 function user_prepare_head($object)
 {
diff --git a/htdocs/lib/viewfiles.lib.php b/htdocs/lib/viewfiles.lib.php
index 92dd8b06b23..f444b9d0a96 100644
--- a/htdocs/lib/viewfiles.lib.php
+++ b/htdocs/lib/viewfiles.lib.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *	\file       htdocs/lib/viewfiles.lib.php
  *	\brief      Set of function to view file content
- *	\version 	$Id: viewfiles.lib.php,v 1.8 2011/07/31 23:25:42 eldy Exp $
+ *	\version 	$Id$
  */
 
 
diff --git a/htdocs/lib/ws.lib.php b/htdocs/lib/ws.lib.php
index f5b3ba3656e..9cce70fc3b5 100755
--- a/htdocs/lib/ws.lib.php
+++ b/htdocs/lib/ws.lib.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
 /**
  *  \file		htdocs/lib/ws.lib.php
  *  \brief		Set of function for manipulating web services
- * 	\version	$Id: ws.lib.php,v 1.3 2011/07/31 23:25:42 eldy Exp $
+ * 	\version	$Id$
  */
 
 
diff --git a/htdocs/lib/xcal.lib.php b/htdocs/lib/xcal.lib.php
index 1e3f11e7126..7b72f9b4d04 100644
--- a/htdocs/lib/xcal.lib.php
+++ b/htdocs/lib/xcal.lib.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 
 /**
  *  \file       htdocs/lib/xcal.lib.php
  *  \brief      Function to manage calendar files (vcal/ical/...)
- *  \version    $Id: xcal.lib.php,v 1.40 2011/07/31 23:25:58 eldy Exp $
+ *  \version    $Id: xcal.lib.php,v 1.39 2011/07/08 17:12:03 eldy Exp $
  */
 
 /**
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index e889ff94e49..9dc3d64f56c 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -15,14 +15,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *  \file       htdocs/livraison/class/livraison.class.php
  *  \ingroup    delivery
  *  \brief      Fichier de la classe de gestion des bons de livraison
- *  \version    $Id: livraison.class.php,v 1.28 2011/07/31 23:24:38 eldy Exp $
+ *  \version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");
diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php
index df55391e08a..bbb26d33cc0 100644
--- a/htdocs/livraison/fiche.php
+++ b/htdocs/livraison/fiche.php
@@ -16,14 +16,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/livraison/fiche.php
  *	\ingroup    livraison
  *	\brief      Fiche descriptive d'un bon de livraison=reception
- *	\version    $Id: fiche.php,v 1.114 2011/07/31 23:24:38 eldy Exp $
+ *	\version    $Id$
  */
 
 require("../main.inc.php");
@@ -636,5 +637,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 23:24:38 $ - $Revision: 1.114 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/mantis/admin/mantis.php b/htdocs/mantis/admin/mantis.php
index 8504264034a..287328e3a6e 100644
--- a/htdocs/mantis/admin/mantis.php
+++ b/htdocs/mantis/admin/mantis.php
@@ -16,16 +16,17 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: mantis.php,v 1.3 2011/07/31 23:24:38 eldy Exp $
+ * $Id$
  */
 
 /**
  *   \file       htdocs/mantis/admin/mantis.php
  *   \ingroup    mantis
  *   \brief      Page de configuration du module mantis
- *   \version    $Revision: 1.3 $
+ *   \version    $Revision$
  */
 
 require("../../main.inc.php");
@@ -204,5 +205,5 @@ print "<br>";
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 23:24:38 $ - $Revision: 1.3 $');
+llxFooter('$Date$ - $Revision$');
 ?>
diff --git a/htdocs/mantis/class/mantis.class.php b/htdocs/mantis/class/mantis.class.php
index 31a003e4c10..d8bcd8993a8 100644
--- a/htdocs/mantis/class/mantis.class.php
+++ b/htdocs/mantis/class/mantis.class.php
@@ -13,9 +13,10 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: mantis.class.php,v 1.2 2011/07/31 23:24:38 eldy Exp $
+ * $Id$
  */
 
 /**
@@ -23,7 +24,7 @@
         \ingroup    mantis
 		\brief      Ensemble des fonctions permettant d'acceder a la database mantis.
 		\author     Laurent Destailleur.
-		\version    $Revision: 1.2 $
+		\version    $Revision$
 */
 
 
diff --git a/htdocs/mantis/mantis.php b/htdocs/mantis/mantis.php
index 4f1877aabdc..26fd5939d5c 100644
--- a/htdocs/mantis/mantis.php
+++ b/htdocs/mantis/mantis.php
@@ -12,16 +12,17 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id: mantis.php,v 1.8 2011/07/31 23:24:38 eldy Exp $
+ * $Id$
  */
 
 /**	    \file       htdocs/mantis/mantis.php
         \ingroup    mantis
 		\brief      Page generant 2 frames, une pour le menu Dolibarr, l'autre pour l'affichage de Mantis
 		\author	    Laurent Destailleur
-		\version    $Revision: 1.8 $
+		\version    $Revision$
 */
 
 require("../main.inc.php");
@@ -30,7 +31,7 @@ if (empty($conf->global->PHPMANTIS_URL))
 {
 	llxHeader();
 	print '<div class="error">Module Mantis was not configured properly.</div>';
-	llxFooter('$Date: 2011/07/31 23:24:38 $ - $Revision: 1.8 $');
+	llxFooter('$Date$ - $Revision$');
 }
 
 $mainmenu=isset($_GET["mainmenu"])?$_GET["mainmenu"]:"";
diff --git a/htdocs/mantis/mantistop.php b/htdocs/mantis/mantistop.php
index 22d39f78d27..4b9ceb3f5f0 100644
--- a/htdocs/mantis/mantistop.php
+++ b/htdocs/mantis/mantistop.php
@@ -12,14 +12,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
 		\file 		htdocs/mantis/mantistop.php
         \ingroup    mantis
 		\brief      Top frame to show mantis application
-		\version    $Id: mantistop.php,v 1.5 2011/07/31 23:24:38 eldy Exp $
+		\version    $Id$
 */
 
 require ("../main.inc.php");
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8bccf934120..1da2adb751e 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -17,14 +17,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	\file       htdocs/product/class/product.class.php
  *	\ingroup    produit
  *	\brief      Fichier de la classe des produits predefinis
- *	\version    $Id: product.class.php,v 1.48 2011/07/31 23:24:03 eldy Exp $
+ *	\version    $Id: product.class.php,v 1.47 2011/07/29 20:47:35 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
 
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index efbd289cb3f..a65f888ab11 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -18,14 +18,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *  \file       htdocs/product/fiche.php
  *  \ingroup    product
  *  \brief      Page to show product
- *  \version    $Id: fiche.php,v 1.374 2011/07/31 23:19:26 eldy Exp $
+ *  \version    $Id: fiche.php,v 1.373 2011/07/29 20:47:35 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -1645,6 +1646,6 @@ if ($product->id && $action == '' && $product->status)
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 23:19:26 $ - $Revision: 1.374 $');
+llxFooter('$Date: 2011/07/29 20:47:35 $ - $Revision: 1.373 $');
 
 ?>
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 8f373b577e8..79601ea1031 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -13,14 +13,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /*
  * 		\files		htdocs/societe/class/companybankaccount.class.php
  *		\ingroup    societe
  *		\brief      File of class to manage bank accounts description of third parties
- *   	\version	$Id: companybankaccount.class.php,v 1.11 2011/07/31 23:22:58 eldy Exp $
+ *   	\version	$Id: companybankaccount.class.php,v 1.10 2011/07/29 20:47:35 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/compta/bank/class/account.class.php");
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index 724900dc500..8cf57ec0b64 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -15,14 +15,15 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *	    \file       htdocs/societe/rib.php
  *      \ingroup    societe
  *		\brief      BAN tab for companies
- *		\version    $Id: rib.php,v 1.37 2011/07/31 23:22:56 eldy Exp $
+ *		\version    $Id: rib.php,v 1.36 2011/07/29 20:47:34 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -271,5 +272,5 @@ if ($_GET["socid"] && $_GET["action"] == 'edit' && $user->rights->societe->creer
 $db->close();
 
 
-llxFooter('$Date: 2011/07/31 23:22:56 $ - $Revision: 1.37 $');
+llxFooter('$Date: 2011/07/29 20:47:34 $ - $Revision: 1.36 $');
 ?>
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index edb62d728d5..78ca25e85a6 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\file       htdocs/theme/auguria/style.css.php
  *		\brief      Fichier de style CSS du theme auguria
- *		\version    $Id: style.css.php,v 1.92 2011/07/31 23:22:04 eldy Exp $
+ *		\version    $Id: style.css.php,v 1.91 2011/07/28 20:54:02 eldy Exp $
  */
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index c3403b8ca99..6d9f27d592d 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -16,13 +16,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\file       htdocs/theme/bureau2crea/style.css.php
  *		\brief      Fichier de style CSS du theme bureau2crea
- *		\version    $Id: style.css.php,v 1.41 2011/07/31 23:19:57 eldy Exp $
+ *		\version    $Id: style.css.php,v 1.40 2011/07/21 09:05:33 simnandez Exp $
  */
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index c15f65c5630..9af151bc40a 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -14,13 +14,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\file       htdocs/theme/eldy/style.css.php
  *		\brief      Fichier de style CSS du theme Eldy
- *		\version    $Id: style.css.php,v 1.89 2011/07/31 23:22:05 eldy Exp $
+ *		\version    $Id: style.css.php,v 1.88 2011/07/28 13:22:19 eldy Exp $
  */
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php
index bca03dc2770..928700d2f7a 100644
--- a/htdocs/theme/freelug/style.css.php
+++ b/htdocs/theme/freelug/style.css.php
@@ -13,13 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\file       htdocs/theme/freelug/style.css.php
  *		\brief      Fichier de style CSS du theme Freelug
- *		\version    $Id: style.css.php,v 1.44 2011/07/31 23:22:05 eldy Exp $
+ *		\version    $Id: style.css.php,v 1.43 2011/07/28 13:31:58 eldy Exp $
  */
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php
index 6e14cbf8e12..74a4705b691 100644
--- a/htdocs/theme/yellow/style.css.php
+++ b/htdocs/theme/yellow/style.css.php
@@ -13,13 +13,14 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 /**
  *		\file       htdocs/theme/yellow/style.css.php
  *		\brief      Fichier de style CSS du theme Yellow
- *		\version    $Id: style.css.php,v 1.46 2011/07/31 23:22:04 eldy Exp $
+ *		\version    $Id: style.css.php,v 1.45 2011/07/28 13:31:58 eldy Exp $
  */
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index fb4b85a0aa9..143af8934c7 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -14,7 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * or see http://www.gnu.org/
  */
 
@@ -22,7 +23,7 @@
  *		\file       htdocs/viewimage.php
  *		\brief      Wrapper to show images into Dolibarr screens
  *      \remarks    Call to wrapper is '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=diroffile&file=relativepathofofile&cache=0">'
- *		\version    $Id: viewimage.php,v 1.97 2011/07/31 23:19:04 eldy Exp $
+ *		\version    $Id: viewimage.php,v 1.96 2011/07/28 13:56:17 eldy Exp $
  */
 
 // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).