Fix: Uniformize error management

build/deb/README

@@ -22,12 +22,13 @@ with format .DEB (for Debian, Ubuntu, ...).
 # lintian --pedantic -E -I package.deb   To test a package   
 #
 # dpkg -l                                List all packages
-# dpkg -b                                To build package
+# dpkg -b                                To build binary only package
 # dpkg -c package.deb                    List content of package
 # dpkg -I package.deb                    Give informations on package
 # dpkg -i package.deb                    Install a package
-#
+# dpkg-reconfigure -plow package		 Reconfigure package
 # dpkg -L packagename                    List content of installed package 
+# dpkg -r packagename                    Remove config files and interactive saved answers
 # dpkg --purge                           Remove config files and interactive saved answers
 #
 # dpkg-buildpackage -us -uc              Build a source and binary package

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     
+ -- Dolibarr team <contact@dolibarr.org>  Mon, 30 Jul 2011 12:00:00 +0100     
 
 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. 

build/deb/dolibarr.desktop

@@ -3,14 +3,10 @@
 # It must be saved into directory /usr/share/applications
 Version=1.0
 Name=Dolibarr ERP & CRM
-Name[es]=Dolibarr ERP & CRM
 Name[fr]=Dolibarr ERP & CRM
-Name[it]=Dolibarr ERP & CRM
 GenericName=Dolibarr ERP & CRM
 Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations
-Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones
 Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations
-Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti
 # Command to open an URL
 # For Fedora: xdg-open 
 # For Debian/Ubuntu: xdg-open or x-www-browser

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
+		# Copy apache.conf file into target directory.
-        mkdir -p $docdir
+		#fileorig="/usr/share/dolibarr/build/deb/apache.conf"
-        chown -R www-data:www-data $docdir
+		#config="/etc/dolibarr/apache.conf"
-        chmod -R 775 $docdir
-        chmod -R g+s $docdir
-
-		# Copy apache.conf file into target directory
 		#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		
+			echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php		
-			touch $config
+			touch /usr/share/dolibarr/htdocs/conf/conf.php
-			chown -R root:www-data $config
+			chown -R root:www-data /usr/share/dolibarr/htdocs/conf/conf.php
-	    	chmod -R 660 $config
+	    	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

build/deb/postrm

@@ -17,7 +17,36 @@ set -e
 # for details, see /usr/share/doc/packaging-manual/
 
 
+
+lighttpd_remove() {
+	if [ -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then
+		echo "Remove link for Lighttpd config file"
+		rm -f /etc/lighttpd/conf-available/50-dolibarr.conf
+		if which lighty-enable-mod >/dev/null 2>&1 ; then
+			lighty-disable-mod dolibarr
+		else
+			echo "Lighttpd not installed, skipping"
+		fi
+		# See bug #448682
+		if [ -h /etc/lighttpd/conf-enabled/50-dolibarr.conf ] ; then
+		    echo 'Manually deleting lighttpd/dolibarr configuration link'
+		    rm /etc/lighttpd/conf-enabled/50-dolibarr.conf
+		fi
+	fi
+}
+
+apache_remove() {
+	if [ -d /etc/$webserver/conf.d ] && [ -L /etc/$webserver/conf.d/dolibarr.conf ]; then
+		echo "Remove link for Apache config file"
+		rm -f /etc/$webserver/conf.d/dolibarr.conf
+	fi
+}
+
+
+
+if [ -f /usr/share/debconf/confmodule ]; then
     . /usr/share/debconf/confmodule
+fi
 
 db_version 2.0
 
@@ -26,63 +55,62 @@ 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=""
-# Allows us to loop and substitute in one pass
-case $webserver in
-	Apache)		webservers="apache2" ;;
-	Apache-SSL)	webservers="apache2-ssl" ;;
-	Both)		webservers="apache2 apache2-ssl" ;;
-	*)		    webservers="apache2 apache2-ssl" ;;
-esac
-
 
 case "$1" in
 
     # Call when we upgrade
 	upgrade)
+		echo "postrm upgrade"
 	;;
 
     # Call when we uninstall
 	remove)
+		echo "postrm remove"
 		rm -f $lockfile
 
-		# Remove include files
+		# Reconfigure web server
-		export restart=""
+		db_get dolibarr/reconfigure-webserver
-		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" ] ;
+		webservers="$RET"
-				then restart="$restart $server"
+
+		# Restart web servers
+		for webserver in $webservers; do
+			webserver=${webserver%,}
+			if [ "$webserver" = "lighttpd" ] ; then
+				lighttpd_remove
+			else
+				apache_remove $webserver
+			fi
+			# Redirection of 3 is needed because Debconf uses it and it might 
+			# be inherited by webserver. See bug #446324.
+			if [ -f /etc/init.d/$webserver ] ; then
+				if [ -x /usr/sbin/invoke-rc.d ]; then
+					invoke-rc.d $webserver reload 3>/dev/null || true
+				else
+					/etc/init.d/$webserver reload 3>/dev/null || true
+				fi
 			fi
 		done
 	;;
 
     # Call when we uninstall and purge
 	purge)
-		echo "postrm purge webservers=$webservers apacheconfig=$apacheconfig"
+		echo "postrm purge"
 
 		# Ask if we must delete database
 		echo "postrm db_input dolibarr/postrm"
-		db_input critical "dolibarr/postrm" || true
+		db_input critical dolibarr/postrm || true
 		db_go || true
 
 		echo "postrm db_get dolibarr/postrm"
 		# We disable set -e to avoid premature end of script if error
 		set +e
-		db_get "dolibarr/postrm"
+		db_get dolibarr/postrm
 		set -e
 	
 		if [ "$RET" = "true" ] ; then
@@ -185,41 +213,12 @@ case "$1" in
 			echo "postrm Delete of dolibarr database and uploaded files not wanted" 
 		fi
 	
-		# 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
-
 		rm -rf /etc/dolibarr
 
-		# Restart servers
-		for server in $restart ; do
-            # We disable blocking errors
-            set +e
-            echo "Restart server $server if exists"
-    		if [ -x /usr/sbin/invoke-rc.d ]; then
-    		     invoke-rc.d $server reload || true
-    		else
-    		     /etc/init.d/$server reload || true
-    		fi
-    		# We restore blocking errors
-    		set -e
-		done
-		
 		# We clean variable (we ignore errors because db_reset can fails if var was never set)
         set +e
-		db_reset "dolibarr/postrm"
+		db_reset dolibarr/reconfigure-webserver
+		db_reset dolibarr/postrm
         set -e
 
 		#db_purge
@@ -229,7 +228,7 @@ case "$1" in
 	;;
 
 	*)
-		echo "postrm called with unknown argument \`$1'" >&2
+		echo "postrm called with unknown argument $1" >&2
 		exit 0
 	;;
 esac

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='i386';
-    		$ARCH='noarch';
 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
            	$newbuild = $BUILD;
-           	# For fedora
+            $newbuild =~ s/(dev|alpha)/0/gi;				# dev
-            $newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev
+            $newbuild =~ s/beta/1/gi;						# beta
-            $newbuild =~ s/beta/0.2.beta1/gi;				# beta
+            $newbuild =~ s/rc./2/gi;						# rc
-            $newbuild =~ s/rc./0.3.rc1/gi;					# rc
             if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
-            #$newbuild =~ s/(dev|alpha)/0/gi;				# dev
+            # now newbuild is 0-0 or 0-3 for example
-            #$newbuild =~ s/beta/1/gi;						# beta
-            #$newbuild =~ s/rc./2/gi;						# rc
-            #if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
             $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 -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;
-            $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 -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,6 +652,11 @@ 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
@@ -757,7 +670,6 @@ if ($nboftargetok) {
             $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"`;
             # 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"`;
@@ -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/*_all.deb" "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
             }
             else
             {
                 print "Move *_all.deb to $DESTI\n";
-                $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
+                $ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
             }
         	next;
         }

dev/skeletons/modMyModule.class.php

@@ -27,7 +27,7 @@
  *      \file       htdocs/includes/modules/modMyModule.class.php
  *      \ingroup    mymodule
  *      \brief      Description and activation file for module MyModule
- *		\version	$Id: modMyModule.class.php,v 1.66 2011/07/31 22:21:58 eldy Exp $
+ *		\version	$Id: modMyModule.class.php,v 1.67 2011/08/01 13:26:21 hregis Exp $
  */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
@@ -72,7 +72,7 @@ class modMyModule extends DolibarrModules
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
 		$this->picto='generic';
 
-		// Defined if the directory /mymodule/inc/triggers/ contains triggers or not
+		// Defined if the directory /mymodule/includes/triggers/ contains triggers or not
 		$this->triggers = 0;
 
 		// Data directories to create when module is enabled.

htdocs/accountancy/class/accountancyaccount.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/accountancy/class/accountancyaccount.class.php
  * 	\ingroup    accounting
  * 	\brief      Fichier de la classe des comptes comptables
- * 	\version    $Id: accountancyaccount.class.php,v 1.2 2011/08/03 00:45:22 eldy Exp $
+ * 	\version    $Id$
  */
 
 

htdocs/accountancy/class/accountancysystem.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/accountancy/class/accountancysystem.class.php
  * 	\ingroup    accounting
  * 	\brief      File of class to manage accountancy systems
- * 	\version    $Id: accountancysystem.class.php,v 1.3 2011/08/03 00:45:22 eldy Exp $
+ * 	\version    $Id$
  */
 
 

htdocs/adherents/admin/adherent.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/adherents/admin/adherent.php
  *		\ingroup    member
  *		\brief      Page to setup the module Foundation
- *		\version    $Id: adherent.php,v 1.18 2011/08/03 00:45:42 eldy Exp $
+ *		\version    $Id$
  */
 
 require("../../main.inc.php");
@@ -331,7 +332,7 @@ $db->close();
 
 print '<br>';
 
-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.18 $');
+llxFooter('$Date$ - $Revision$');
 
 
 

htdocs/adherents/admin/adherent_extrafields.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/adherents/admin/adherent_extrafields.php
  *		\ingroup    member
  *		\brief      Page to setup extra fields of members
- *		\version    $Id: adherent_extrafields.php,v 1.5 2011/08/03 00:45:42 eldy Exp $
+ *		\version    $Id: adherent_extrafields.php,v 1.4 2011/07/18 19:25:48 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -311,5 +312,5 @@ if ($_GET["attrname"] && $action == 'edit')
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.5 $');
+llxFooter('$Date: 2011/07/18 19:25:48 $ - $Revision: 1.4 $');
 ?>

htdocs/adherents/admin/public.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    member
  *		\brief      File of main public page for member module
  *		\author	    Laurent Destailleur
- *		\version    $Id: public.php,v 1.3 2011/08/03 00:45:42 eldy Exp $
+ *		\version    $Id: public.php,v 1.2 2011/07/05 20:39:36 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -186,5 +187,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.3 $');
+llxFooter('$Date: 2011/07/05 20:39:36 $ - $Revision: 1.2 $');
 ?>

htdocs/adherents/cartes/carte.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/adherents/cartes/carte.php
  *	\ingroup    member
  *	\brief      Page to output members business cards
- *	\version    $Id: carte.php,v 1.42 2011/08/03 00:45:46 eldy Exp $
+ *	\version    $Id$
  */
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
@@ -87,7 +88,7 @@ if ((empty($foruserid) && empty($foruserlogin) && empty($mode)) || $mesg)
     print '</form>';
     print '<br>';
 
-    llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $');
+    llxFooter('$Date$ - $Revision$');
 }
 else
 {
@@ -210,7 +211,7 @@ else
     {
     	dol_print_error($db);
 
-    	llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.42 $');
+    	llxFooter('$Date$ - $Revision$');
     }
 }
 

htdocs/adherents/class/adherent.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/adherents/class/adherent.class.php
  *	\ingroup    member
  *	\brief      File of class to manage members of a foundation
- *	\version    $Id: adherent.class.php,v 1.45 2011/08/03 00:45:44 eldy Exp $
+ *	\version    $Id: adherent.class.php,v 1.44 2011/07/03 16:55:31 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");

htdocs/adherents/class/adherent_type.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.
  */
 
 /**
@@ -22,7 +23,7 @@
  *	\ingroup    member
  *	\brief      File of class to manage members types
  *	\author     Rodolphe Quiedeville
- *	\version    $Id: adherent_type.class.php,v 1.12 2011/08/03 00:45:44 eldy Exp $
+ *	\version    $Id: adherent_type.class.php,v 1.11 2011/07/05 08:08:16 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");

htdocs/adherents/class/adherentstats.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/adherents/class/adherentstats.class.php
  *	\ingroup    member
  *	\brief      Fichier de la classe de gestion des stats des adhérents
- *	\version    $Id: adherentstats.class.php,v 1.3 2011/08/03 00:45:44 eldy Exp $
+ *	\version    $Id: adherentstats.class.php,v 1.2 2011/07/04 10:30:01 eldy Exp $
  */
 
 include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php";

htdocs/adherents/class/cotisation.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/adherents/class/cotisation.class.php
  *      \ingroup    member
  *		\brief      File of class to manage subscriptions of foundation members
- *		\version    $Id: cotisation.class.php,v 1.9 2011/08/03 00:45:44 eldy Exp $
+ *		\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php");

htdocs/adherents/stats/geo.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/adherents/stats/index.php
  *      \ingroup    member
  *		\brief      Page des stats
- *		\version    $Id: geo.php,v 1.2 2011/08/03 00:45:44 eldy Exp $
+ *		\version    $Id$
 */
 
 require("../../main.inc.php");
@@ -275,5 +276,5 @@ dol_fiche_end();
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:45:44 $ - $Revision: 1.2 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/adherents/stats/index.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/adherents/stats/index.php
  *      \ingroup    member
  *		\brief      Page of subscription members statistics
- *		\version    $Id: index.php,v 1.10 2011/08/03 00:45:45 eldy Exp $
+ *		\version    $Id$
  */
 
 require("../../main.inc.php");
@@ -227,5 +228,5 @@ dol_fiche_end();
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/admin/boxes.php

@@ -20,7 +20,7 @@
 /**
  *   \file       htdocs/admin/boxes.php
  *   \brief      Page to setup boxes
- *   \version    $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $
+ *   \version    $Id: boxes.php,v 1.73 2011/08/01 13:26:22 hregis Exp $
  */
 
 require("../main.inc.php");
@@ -278,7 +278,7 @@ if ($resql)
 		{
 			$boxname = $regs[1];
 			$module = $regs[2];
-			$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
+			$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
 		}
 		else
 		{
@@ -394,7 +394,7 @@ if ($resql)
 		{
 			$boxname = $regs[1];
 			$module = $regs[2];
-			$sourcefile = "/".$module."/inc/boxes/".$boxname.".php";
+			$sourcefile = "/".$module."/includes/boxes/".$boxname.".php";
 		}
 		else
 		{
@@ -470,5 +470,5 @@ print '</table>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $');
+llxFooter('$Date: 2011/08/01 13:26:22 $ - $Revision: 1.73 $');
 ?>

htdocs/admin/modules.php

@@ -3,7 +3,7 @@
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2010 Regis Houssin        <regis@dolibarr.fr>
+ * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 /**
  *  \file       htdocs/admin/modules.php
  *  \brief      Page to activate/disable all modules
- *  \version    $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $
+ *  \version    $Id: modules.php,v 1.157 2011/08/01 12:25:15 hregis Exp $
  */
 
 require("../main.inc.php");
@@ -79,12 +79,35 @@ $modules = array();
 $orders = array();
 $categ = array();
 $dirmod = array();
+$modulesdir = array();
 $i = 0;	// is a sequencer of modules found
 $j = 0;	// j is module number. Automatically affected if module number not defined.
-foreach ($conf->file->dol_document_root as $dirroot)
-{
-	$dir = $dirroot . "/includes/modules/";
 
+foreach ($conf->file->dol_document_root as $type => $dirroot)
+{
+	$modulesdir[] = $dirroot . "/includes/modules/";
+	
+	if ($type == 'alt')
+	{	
+		$althandle=@opendir($dirroot);
+		if (is_resource($althandle))
+		{
+			while (($file = readdir($althandle))!==false)
+			{
+			    if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+			    {
+			    	if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
+			    	{
+			    		$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
+			    	}
+			    }
+			}
+		}
+	}
+}
+
+foreach ($modulesdir as $dir)
+{
 	// Load modules attributes in arrays (name, numero, orders) from dir directory
 	//print $dir."\n<br>";
 	dol_syslog("Scan directory ".$dir." for modules");
@@ -449,5 +472,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $');
+llxFooter('$Date: 2011/08/01 12:25:15 $ - $Revision: 1.157 $');
 ?>

htdocs/admin/perms.php

@@ -21,7 +21,7 @@
  *   	\file       htdocs/admin/perms.php
  *      \ingroup    core
  *		\brief      Page d'administration/configuration des permissions par defaut
- *		\version    $Id: perms.php,v 1.42 2011/07/31 22:23:26 eldy Exp $
+ *		\version    $Id: perms.php,v 1.43 2011/08/01 12:53:37 hregis Exp $
  */
 
 require("../main.inc.php");
@@ -76,10 +76,34 @@ $db->begin();
 
 // Charge les modules soumis a permissions
 $modules = array();
-foreach ($conf->file->dol_document_root as $dirroot)
+$modulesdir = array();
-{
-	$dir = $dirroot . "/includes/modules/";
 
+foreach ($conf->file->dol_document_root as $type => $dirroot)
+{
+	$modulesdir[] = $dirroot . "/includes/modules/";
+	
+	if ($type == 'alt')
+	{	
+		$handle=@opendir($dirroot);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle))!==false)
+			{
+			    if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+			    {
+			    	if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
+			    	{
+			    		$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
+			    	}
+			    }
+			}
+			closedir($handle);
+		}
+	}
+}
+
+foreach ($modulesdir as $dir)
+{
 	// Load modules attributes in arrays (name, numero, orders) from dir directory
 	//print $dir."\n<br>";
 	$handle=@opendir($dir);
@@ -194,5 +218,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $');
+llxFooter('$Date: 2011/08/01 12:53:37 $ - $Revision: 1.43 $');
 ?>

htdocs/admin/tools/dolibarr_export.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/tools/dolibarr_export.php
  *		\ingroup	core
  *		\brief      Page to export database
- *		\version    $Id: dolibarr_export.php,v 1.40 2011/08/03 00:45:43 eldy Exp $
+ *		\version    $Id$
  */
 
 require("../../main.inc.php");
@@ -331,5 +332,5 @@ $result=$formfile->show_documents('systemtools','backup',$conf->admin->dir_outpu
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.40 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/admin/tools/dolibarr_import.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/tools/dolibarr_import.php
  *		\ingroup	core
  * 		\brief      Page to import database
- *		\version    $Id: dolibarr_import.php,v 1.24 2011/08/03 00:45:43 eldy Exp $
+ *		\version    $Id$
  */
 
 require("../../main.inc.php");
@@ -184,5 +185,5 @@ else if ($db->label == 'PostgreSQL')
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.24 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/admin/tools/eaccelerator.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.
  */
 
 /**
  *     \file       htdocs/admin/tools/eaccelerator.php
  *     \brief      Page administration de eaccelerator
- *     \version    $Id: eaccelerator.php,v 1.18 2011/08/03 00:45:43 eldy Exp $
+ *     \version    $Id$
  */
 
 require("../../main.inc.php");
@@ -39,7 +40,7 @@ llxHeader();
 if (!function_exists('eaccelerator_info'))
 {
 	print 'eAccelerator is not installed.';
-	llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $');
+	llxfooter('$Date$ - $Revision$');
 	exit;
 }
 
@@ -338,5 +339,5 @@ print '<strong>Eaccelerator is created by the eAccelerator team, <a href="http:/
 print "</td></tr></table>";
 
 
-llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $');
+llxfooter('$Date$ - $Revision$');
 ?>

htdocs/admin/tools/export.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.
  */
 
 /**
  *		\file 		htdocs/admin/tools/export.php
  *		\brief      Page to export a database into a dump file
- *		\version    $Id: export.php,v 1.45 2011/08/03 00:45:43 eldy Exp $
+ *		\version    $Id$
  */
 
 require("../../main.inc.php");
@@ -316,5 +317,5 @@ print '<br>';
 
 $time_end = time();
 
-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.45 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/admin/tools/index.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/admin/tools/index.php
  * 		\brief      Page d'accueil de l'espace outils admin
- *		\version    $Id: index.php,v 1.7 2011/08/03 00:45:43 eldy Exp $
+ *		\version    $Id$
  */
 
 require("../../main.inc.php");
@@ -56,5 +57,5 @@ print info_admin($langs->trans("SystemAreaForAdminOnly")).'<br>';
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.7 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/admin/tools/listevents.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/tools/listevents.php
  *      \ingroup    core
  *      \brief      List of security events
- *      \version    $Id: listevents.php,v 1.32 2011/08/03 00:45:43 eldy Exp $
+ *      \version    $Id: listevents.php,v 1.31 2011/07/18 23:28:30 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -255,5 +256,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.32 $');
+llxFooter('$Date: 2011/07/18 23:28:30 $ - $Revision: 1.31 $');
 ?>

htdocs/admin/tools/listsessions.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/tools/listsessions.php
  *      \ingroup    core
  *      \brief      List of PHP sessions
- *      \version    $Id: listsessions.php,v 1.12 2011/08/03 00:45:43 eldy Exp $
+ *      \version    $Id$
  */
 
 require("../../main.inc.php");
@@ -210,5 +211,5 @@ print '<br>';
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.12 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/admin/tools/purge.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.
  */
 
 /**
  *		\file 		htdocs/admin/tools/purge.php
  *		\brief      Page to purge files (temporary or not)
- *		\version    $Id: purge.php,v 1.19 2011/08/03 00:45:43 eldy Exp $
+ *		\version    $Id$
  */
 
 require("../../main.inc.php");
@@ -171,5 +172,5 @@ if (preg_match('/^confirm/i',$_REQUEST["choice"]))
 }
 
 
-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.19 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/admin/tools/update.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/admin/tools/update.php
  *		\brief      Page to make a Dolibarr online upgrade
- *		\version    $Id: update.php,v 1.17 2011/08/03 00:45:43 eldy Exp $
+ *		\version    $Id$
  */
 
 require("../../main.inc.php");
@@ -143,5 +144,5 @@ print $langs->trans("SetupIsReadyForUse").'<br>';
 
 print '</form>';
 
-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/asterisk/cidlookup.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.
  */
 
 /**

htdocs/asterisk/wrapper.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.
  */
 
 /**
  *	\file       htdocs/asterisk/wrapper.php
  *  \brief      File that is entry point to call an Asterisk server
- *  \version    $Id: wrapper.php,v 1.9 2011/08/03 00:45:45 eldy Exp $
+ *  \version    $Id$
  *	\remarks	To be used, an Asterisk user must be created by adding this
  * 				in /etc/asterisk/manager.conf
  * 				[dolibarr]

htdocs/bookmarks/admin/bookmark.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/bookmarks/admin/bookmark.php
  *		\ingroup    bookmark
  *		\brief      Page to setup bookmark module
- *		\version    $Id: bookmark.php,v 1.3 2011/08/03 00:45:46 eldy Exp $
+ *		\version    $Id$
  */
 
 require("../../main.inc.php");
@@ -83,5 +84,5 @@ print '</table></form>';
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.3 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/bookmarks/bookmarks.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/bookmarks/bookmarks.lib.php
  *	\ingroup	bookmarks
  *	\brief      File with library for bookmark module
- *	\version    $Id: bookmarks.lib.php,v 1.23 2011/08/03 00:45:45 eldy Exp $
+ *	\version    $Id$
  */
 
 /**

htdocs/bookmarks/class/bookmark.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/bookmarks/class/bookmark.class.php
  *      \ingroup    bookmark
  *      \brief      File of class to manage bookmarks
- *      \version    $Id: bookmark.class.php,v 1.7 2011/08/03 00:45:47 eldy Exp $
+ *      \version    $Id$
  */
 
 

htdocs/bookmarks/fiche.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/bookmarks/fiche.php
  *       \brief      Page display/creation of bookmarks
  *       \ingroup    bookmark
- *       \version    $Id: fiche.php,v 1.27 2011/08/03 00:45:45 eldy Exp $
+ *       \version    $Id$
  */
 
 
@@ -284,5 +285,5 @@ if ($_GET["id"] > 0 && ! preg_match('/^add/i',$_GET["action"]))
 $db->close();
 
 
-llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.27 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/bookmarks/liste.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/bookmarks/liste.php
  *       \brief      Page to display list of bookmarks
  *       \ingroup    bookmark
- *       \version    $Id: liste.php,v 1.25 2011/08/03 00:45:45 eldy Exp $
+ *       \version    $Id$
  */
 
 require("../main.inc.php");
@@ -206,5 +207,5 @@ print '</div>';
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.25 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/boutique/admin/boutique.php

@@ -15,16 +15,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: boutique.php,v 1.2 2011/08/03 00:45:45 eldy Exp $
+ * $Id$
  */
 
 /**
  *  \file 		htdocs/boutique/admin/boutique.php
  *  \ingroup    boutique
  *  \brief      Page d'administration/configuration du module OsCommerce
- *  \version    $Revision: 1.2 $
+ *  \version    $Revision$
  */
 
 require("../../main.inc.php");
@@ -213,5 +214,5 @@ print "<br>";
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.2 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/boutique/client/class/boutiqueclient.class.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: boutiqueclient.class.php,v 1.2 2011/08/03 00:45:46 eldy Exp $
+ * $Id$
  *
  */
 
@@ -22,7 +23,7 @@
  *      \file       htdocs/boutique/client/class/boutiqueclient.class.php
  *      \brief      Classe permettant de gerer des clients de la boutique online
  *      \author	    Rodolphe Quiedeville
- *      \version    $Revision: 1.2 $
+ *      \version    $Revision$
  */
 
 /**

htdocs/boutique/client/fiche.php

@@ -14,16 +14,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: fiche.php,v 1.22 2011/08/03 00:45:42 eldy Exp $
+ * $Id$
  */
 
 /**
  *	\file       htdocs/boutique/client/fiche.php
  *	\ingroup    boutique
  *	\brief      Page fiche client OSCommerce
- *	\version    $Revision: 1.22 $
+ *	\version    $Revision$
  */
 
 require("../../main.inc.php");
@@ -128,5 +129,5 @@ else
 
 $dbosc->close();
 
-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.22 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/boutique/client/index.php

@@ -13,16 +13,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: index.php,v 1.17 2011/08/03 00:45:42 eldy Exp $
+ * $Id$
  */
 
 /**
 	    \file       htdocs/boutique/client/index.php
 		\ingroup    boutique
 		\brief      Page gestion client OSCommerce
-		\version    $Revision: 1.17 $
+		\version    $Revision$
 */
 
 require("../../main.inc.php");
@@ -90,5 +91,5 @@ else
 
 $dbosc->close();
 
-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/boutique/commande/ca.php

@@ -13,16 +13,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: ca.php,v 1.17 2011/08/03 00:45:43 eldy Exp $
+ * $Id$
  */
 
 /**
 		\file 		htdocs/boutique/commande/ca.php
 		\ingroup    boutique
 		\brief      Page ca commandes du module OsCommerce
-		\version    $Revision: 1.17 $
+		\version    $Revision$
 */
 
 require("../../main.inc.php");
@@ -114,5 +115,5 @@ print "</table>";
 
 $dbosc->close();
 
-llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/boutique/commande/class/boutiquecommande.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/boutique/commande/class/boutiquecommande.class.php
  *	\ingroup    osc
  *	\brief      Fichier de la classe des commandes de la boutique online
- *	\version    $Id: boutiquecommande.class.php,v 1.7 2011/08/03 00:45:46 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/societe/class/address.class.php");

htdocs/boutique/commande/fiche.php

@@ -14,16 +14,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: fiche.php,v 1.24 2011/08/03 00:45:44 eldy Exp $
+ * $Id$
  */
 
 /**
  \file       htdocs/boutique/commande/fiche.php
  \ingroup    boutique
  \brief      Page fiche commande OSCommerce
- \version    $Revision: 1.24 $
+ \version    $Revision$
  */
 
 require("../../main.inc.php");
@@ -154,5 +155,5 @@ print '</table><br>';
 
 $dbosc->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date: 2011/08/03 00:45:44 $ r&eacute;vision $Revision: 1.24 $</em>");
+llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
 ?>

htdocs/boutique/commande/index.php

@@ -13,16 +13,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: index.php,v 1.23 2011/08/03 00:45:43 eldy Exp $
+ * $Id$
  */
 
 /**
 	    \file       htdocs/boutique/commande/index.php
 		\ingroup    boutique
 		\brief      Page gestion commandes OSCommerce
-		\version    $Revision: 1.23 $
+		\version    $Revision$
 */
 
 require("../../main.inc.php");
@@ -91,5 +92,5 @@ else
 
 $dbosc->close();
 
-llxFooter("<em>Derni&egrave;re modification $Date: 2011/08/03 00:45:43 $ r&eacute;vision $Revision: 1.23 $</em>");
+llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
 ?>

htdocs/boutique/critiques/bestproduct.php

@@ -14,17 +14,18 @@
  * 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: bestproduct.php,v 1.10 2011/08/03 00:45:46 eldy Exp $
+ * $Id$
- * $Source: /cvsroot/dolibarr/dolibarr/htdocs/boutique/critiques/bestproduct.php,v $
+ * $Source$
  */
 
 /**
 	    \file       htdocs/boutique/critiques/bestproduct.php
 		\ingroup    boutique
 		\brief      Page affichage meilleures critiques OS Commerce
-		\version    $Revision: 1.10 $
+		\version    $Revision$
 */
 
 require("../../main.inc.php");
@@ -98,5 +99,5 @@ print "</TABLE>";
 
 $dbosc->close();
 
-llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/boutique/critiques/class/critique.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/boutique/critiques/class/critique.class.php
  *		\ingroup    osc
  *		\brief      Fichier de la classe des critiques OSCommerce
- *		\version    $Id: critique.class.php,v 1.4 2011/08/03 00:45:42 eldy Exp $
+ *		\version    $Id$
  */
 
 

htdocs/boutique/critiques/fiche.php

@@ -13,16 +13,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: fiche.php,v 1.5 2011/08/03 00:45:46 eldy Exp $
+ * $Id$
  */
 
 /**
 	    \file       htdocs/boutique/critiques/fiche.php
 		\ingroup    boutique
 		\brief      Page fiche critique OS Commerce
-		\version    $Revision: 1.5 $
+		\version    $Revision$
 */
 
 require("../../main.inc.php");
@@ -80,6 +81,6 @@ print '</table><br>';
 
 $dbosc->close();
 
-llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.5 $');
+llxFooter('$Date$ - $Revision$');
 
 ?>

htdocs/boutique/critiques/index.php

@@ -13,16 +13,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: index.php,v 1.10 2011/08/03 00:45:46 eldy Exp $
+ * $Id$
  */
 
 /**
 	    \file       htdocs/boutique/critiques/index.php
 		\ingroup    boutique
 		\brief      Page gestion critiques OSCommerce
-		\version    $Revision: 1.10 $
+		\version    $Revision$
 */
 
 require("../../main.inc.php");
@@ -91,5 +92,5 @@ print "</TABLE>";
 
 $dbosc->close();
 
-llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.10 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/boutique/index.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/boutique/index.php
+ \file       htdocs/boutique/index.php
- *	\ingroup    boutique
+ \ingroup    boutique
- *	\brief      Page accueil zone boutique
+ \brief      Page accueil zone boutique
- *	\version    $Id: index.php,v 1.17 2011/08/03 01:17:17 eldy Exp $
+ \version    $Id$
  */
 
 require("../main.inc.php");
@@ -238,5 +239,5 @@ print '</tr></table>';
 
 $dbosc->close();
 
-llxFooter('$Date: 2011/08/03 01:17:17 $ - $Revision: 1.17 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/boutique/notification/fiche.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/boutique/notification/fiche.php
 		\ingroup    boutique
 		\brief      Page fiche notification OS Commerce
-		\version    $Id: fiche.php,v 1.17 2011/08/03 00:45:42 eldy Exp $
+		\version    $Id$
 */
 
 require("../../main.inc.php");
@@ -149,5 +150,5 @@ print '</div>';
 
 $dbosc->close();
 
-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.17 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/boutique/notification/index.php

@@ -14,16 +14,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: index.php,v 1.19 2011/08/03 00:45:42 eldy Exp $
+ * $Id$
  */
 
 /**
 	    \file       htdocs/boutique/notification/index.php
 		\ingroup    boutique
 		\brief      Page gestion notification OS Commerce
-		\version    $Revision: 1.19 $
+		\version    $Revision$
 */
 
 require("../../main.inc.php");
@@ -88,5 +89,5 @@ else
 
 $dbosc->close();
 
-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.19 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/boutique/notification/produits.php

@@ -14,16 +14,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: produits.php,v 1.16 2011/08/03 00:45:42 eldy Exp $
+ * $Id$
  */
 
 /**
 	    \file       htdocs/boutique/notification/produits.php
 		\ingroup    boutique
 		\brief      Page fiche notification produits OS Commerce
-		\version    $Revision: 1.16 $
+		\version    $Revision$
 */
 
 require("../../main.inc.php");
@@ -94,5 +95,5 @@ else
 
 $dbosc->close();
 
-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.16 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/boutique/osc_master.inc.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.
  */
 
 /**
- *       \file       htdocs/boutique/osc_master.inc.php
+        \file       htdocs/boutique/osc_master.inc.php
- *       \brief      Fichier de preparation de l'environnement Dolibarr pour OSCommerce
+        \brief      Fichier de preparation de l'environnement Dolibarr pour OSCommerce
- *       \version    $Id: osc_master.inc.php,v 1.6 2011/08/03 01:17:17 eldy Exp $
+        \version    $Id$
 */
 
 require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php");

htdocs/boutique/produits/index.php

@@ -13,16 +13,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: index.php,v 1.8 2011/08/03 00:45:45 eldy Exp $
+ * $Id$
  */
 
 /**
 		\file 		htdocs/boutique/produits/index.php
 		\ingroup    boutique
 		\brief      Page gestion produits du module OsCommerce
-		\version    $Revision: 1.8 $
+		\version    $Revision$
 */
 
 require("../../main.inc.php");
@@ -87,5 +88,5 @@ else
 
 $dbosc->close();
 
-llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.8 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/boutique/produits/osc-liste.php

@@ -13,16 +13,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: osc-liste.php,v 1.10 2011/08/03 00:45:45 eldy Exp $
+ * $Id$
  */
 
 /**
 		\file 		htdocs/boutique/produits/osc-liste.php
 		\ingroup    boutique
 		\brief      Page gestion produits du module OsCommerce
-		\version    $Revision: 1.10 $
+		\version    $Revision$
 */
 
 require("../../main.inc.php");
@@ -105,5 +106,5 @@ print "</TABLE>";
 
 $dbosc->close();
 
-llxFooter('$Date: 2011/08/03 00:45:45 $ - $Revision: 1.10 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/boutique/promotion/class/promotion.class.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: promotion.class.php,v 1.3 2011/08/03 00:45:46 eldy Exp $
+ * $Id$
  */
 
 class Promotion {

htdocs/boutique/promotion/index.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/boutique/promotion/index.php
 		\ingroup    boutique
 		\brief      Page gestion promotions OSCommerce
-		\version    $Id: index.php,v 1.14 2011/08/03 00:45:42 eldy Exp $
+		\version    $Id$
 */
 
 require("../../main.inc.php");
@@ -116,6 +117,6 @@ else
 }
 $dbosc->close();
 
-llxFooter('$Date: 2011/08/03 00:45:42 $ - $Revision: 1.14 $');
+llxFooter('$Date$ - $Revision$');
 
 ?>

htdocs/boutique/sql/emulate_oscommerce/llx_osc_categories.sql

@@ -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: llx_osc_categories.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
+-- $Id$
 -- ===================================================================
 
 CREATE TABLE llx_osc_categories (

htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.key.sql

@@ -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: llx_osc_customer.key.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
+-- $Id$
 -- ===================================================================
 
 

htdocs/boutique/sql/emulate_oscommerce/llx_osc_customer.sql

@@ -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: llx_osc_customer.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
+-- $Id$
 -- ===================================================================
 
 CREATE TABLE llx_osc_customer (

htdocs/boutique/sql/emulate_oscommerce/llx_osc_order.sql

@@ -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: llx_osc_order.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
+-- $Id$
 -- ===================================================================
 
 CREATE TABLE llx_osc_order (

htdocs/boutique/sql/emulate_oscommerce/llx_osc_product.sql

@@ -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: llx_osc_product.sql,v 1.1 2011/08/03 01:03:46 eldy Exp $
+-- $Id$
 -- ===================================================================
 
 CREATE TABLE llx_osc_product (

htdocs/cashdesk/admin/cashdesk.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/cashdesk/admin/cashdesk.php
  *	\ingroup    cashdesk
  *	\brief      Setup page for cashdesk module
- *	\version    $Id: cashdesk.php,v 1.7 2011/08/03 00:46:38 eldy Exp $
+ *	\version    $Id$
  */
 
 require("../../main.inc.php");
@@ -128,5 +129,5 @@ print '<center><input type="submit" class="button" value="'.$langs->trans("Save"
 
 print "</form>\n";
 
-llxFooter('$Date: 2011/08/03 00:46:38 $ - $Revision: 1.7 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/cashdesk/class/Auth.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.
  */
 
 

htdocs/cashdesk/class/Facturation.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.
  */
 
 include_once(DOL_DOCUMENT_ROOT.'/lib/price.lib.php');

htdocs/cashdesk/include/environnement.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.
  */
 
 // This file initializes more variables to already initialized variables with main.inc.php

htdocs/cashdesk/include/fonctions.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.
  */
 
 	// Cr<43>ation al<61>atoire de chaines de caract<63>res de longueur $taille pass<73>e en argument

htdocs/cashdesk/javascript/facturation1.js

@@ -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.
  */
 
 // Calcul et affichage en temps reel des informations sur le produit en cours

htdocs/cashdesk/tpl/facturation1.tpl.php

@@ -19,9 +19,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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: facturation1.tpl.php,v 1.15 2011/08/03 01:13:30 eldy Exp $
+$Id$
 -->
 <script type="text/javascript" src="javascript/facturation1.js"></script>
 <script type="text/javascript" src="javascript/dhtml.js"></script>

htdocs/cashdesk/tpl/liste_articles.tpl.php

@@ -23,7 +23,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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.
 -->
 <div class="liste_articles_haut">
 <div class="liste_articles_bas">

htdocs/cashdesk/tpl/ticket.tpl.php

@@ -15,7 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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.
 -->
 <html>
 <head>

htdocs/cashdesk/tpl/validation2.tpl.php

@@ -14,7 +14,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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.
 -->
 <h3 class="titre1"><?php echo $langs->trans("SellFinished"); ?></h3>
 

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');

htdocs/categories/categorie.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/categories/categorie.php
  *  \ingroup    category
  *  \brief      Page to show category tab
- *  \version    $Id: categorie.php,v 1.65 2011/08/03 00:46:32 eldy Exp $
+ *  \version    $Id$
  */
 
 require("../main.inc.php");
@@ -534,5 +535,5 @@ function formCategory($db,$object,$typeid)
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.65 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/categories/class/categorie.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/categories/class/categorie.class.php
  *	\ingroup    categorie
  *	\brief      File of class to manage categories
- *	\version	$Id: categorie.class.php,v 1.18 2011/08/03 00:46:39 eldy Exp $
+ *	\version	$Id: categorie.class.php,v 1.17 2011/07/04 09:54:02 eldy Exp $
  */
 
 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");

htdocs/categories/docreate.php

@@ -13,16 +13,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: docreate.php,v 1.9 2011/08/03 00:46:32 eldy Exp $
+ * $Id$
  */
 
 /**
  * 		\file       htdocs/categories/docreate.php
  * 		\ingroup    category
  * 		\brief      Page de creation categorie
- * 		\version    $Revision: 1.9 $
+ * 		\version    $Revision$
  */
 
 require("../main.inc.php");

htdocs/categories/domodif.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/categories/domodif.php
 		\ingroup    category
 		\brief      Page de modification categorie
-		\version    $Revision: 1.6 $
+		\version    $Revision$
 */
 
 require("../main.inc.php");

htdocs/categories/edit.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/categories/edit.php
  *      \ingroup    category
  *      \brief      Page d'edition de categorie produit
- *      \version    $Id: edit.php,v 1.39 2011/08/03 00:46:31 eldy Exp $
+ *      \version    $Id$
  */
 
 require("../main.inc.php");
@@ -151,5 +152,5 @@ print '</td></tr></table>';
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.39 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/categories/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/categories/fiche.php
  *		\ingroup    category
  *		\brief      Page to create a new category
- *		\version	$Id: fiche.php,v 1.85 2011/08/03 00:46:32 eldy Exp $
+ *		\version	$Id: fiche.php,v 1.84 2011/07/04 09:54:02 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -234,5 +235,5 @@ if ($user->rights->categorie->creer)
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.85 $');
+llxFooter('$Date: 2011/07/04 09:54:02 $ - $Revision: 1.84 $');
 ?>

htdocs/categories/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/categories/index.php
  *      \ingroup    category
  *      \brief      Home page of category area
- *	 	\version	$Id: index.php,v 1.55 2011/08/03 00:46:32 eldy Exp $
+ *	 	\version	$Id: index.php,v 1.54 2011/07/20 19:03:34 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -312,5 +313,5 @@ print "</table>";
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.55 $');
+llxFooter('$Date: 2011/07/20 19:03:34 $ - $Revision: 1.54 $');
 ?>

htdocs/categories/liste.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/categories/liste.php
  *    \ingroup    category
  *    \brief      Page liste des categories
- *    \version	$Id: liste.php,v 1.10 2011/08/03 00:46:32 eldy Exp $
+ *    \version	$Id$
  */
 
 require("../main.inc.php");
@@ -76,5 +77,5 @@ print '</td></tr></table>';
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.10 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/categories/photos.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/categories/photos.php
  *       \ingroup    category
  *       \brief      Gestion des photos d'une categorie
- *       \version    $Id: photos.php,v 1.13 2011/08/03 00:46:32 eldy Exp $
+ *       \version    $Id$
  */
 
 require("../main.inc.php");
@@ -304,5 +305,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:32 $ - $Revision: 1.13 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/categories/viewcat.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/categories/viewcat.php
  *       \ingroup    category
  *       \brief      Page to show a category card
- *       \version    $Revision: 1.53 $
+ *       \version    $Revision$
  */
 
 require("../main.inc.php");
@@ -363,5 +364,5 @@ if ($object->type == 3)
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:31 $ - $Revision: 1.53 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/comm/action/class/actioncomm.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/comm/action/class/actioncomm.class.php
  *       \ingroup    commercial
  *       \brief      File of class to manage agenda events (actions)
- *       \version    $Id: actioncomm.class.php,v 1.43 2011/08/03 00:46:20 eldy Exp $
+ *       \version    $Id: actioncomm.class.php,v 1.42 2011/07/04 09:36:29 eldy Exp $
  */
 require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php');

htdocs/comm/action/class/cactioncomm.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/comm/action/class/cactioncomm.class.php
  *       \ingroup    commercial
  *       \brief      File of class to manage type of agenda events
- *       \version    $Id: cactioncomm.class.php,v 1.6 2011/08/03 00:46:21 eldy Exp $
+ *       \version    $Id$
 */
 
 

htdocs/comm/action/class/ical.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/comm/action/class/ical.class.php
  *       \ingroup    commercial
  *       \brief      File of class to parse ical calendars
- *       \version    $Id: ical.class.php,v 1.6 2011/08/03 00:46:20 eldy Exp $
+ *       \version    $Id$
  */
 class ical
 {

htdocs/comm/action/rapport/index.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/comm/action/rapport/index.php
  *      \ingroup    commercial
  *		\brief      Page with reports of actions
- *		\version    $Id: index.php,v 1.48 2011/08/03 00:46:36 eldy Exp $
+ *		\version    $Id$
  */
 
 require("../../../main.inc.php");
@@ -150,5 +151,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:36 $ - $Revision: 1.48 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/comm/addpropal.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/addpropal.php
  *	\ingroup    propal
  *	\brief      Page to add a new commercial proposal
- *	\version    $Id: addpropal.php,v 1.131 2011/08/03 00:46:26 eldy Exp $
+ *	\version    $Id: addpropal.php,v 1.130 2011/07/17 19:08:33 eldy Exp $
  */
 
 require("../main.inc.php");
@@ -338,5 +339,5 @@ if ($_GET["action"] == 'create')
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.131 $');
+llxFooter('$Date: 2011/07/17 19:08:33 $ - $Revision: 1.130 $');
 ?>

htdocs/comm/address.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/comm/address.php
  *      \ingroup    societe
  *      \brief      Onglet adresses d'un client
- *      \version    $Id: address.php,v 1.9 2011/08/03 00:46:27 eldy Exp $
+ *      \version    $Id$
  */
 
 require("../main.inc.php");
@@ -516,5 +517,5 @@ else
 $db->close();
 
 
-llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.9 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/comm/bookmark.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.
  */
 
 /**
         \file       htdocs/comm/bookmark.php
         \brief      Page affichage des bookmarks
-        \version    $Id: bookmark.php,v 1.24 2011/08/03 00:46:26 eldy Exp $
+        \version    $Id$
 */
 
 
@@ -146,5 +147,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.24 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/comm/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/comm/clients.php
  *	\ingroup    commercial, societe
  *	\brief      List of customers
- *	\version    $Id: clients.php,v 1.79 2011/08/03 00:46:26 eldy Exp $
+ *	\version    $Id$
  */
 
 require("../main.inc.php");
@@ -249,5 +250,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.79 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/comm/contact.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/comm/contact.php
         \ingroup    commercial
         \brief      Liste des contacts
-        \version    $Id: contact.php,v 1.50 2011/08/03 00:46:26 eldy Exp $
+        \version    $Id$
 */
 
 require("../main.inc.php");
@@ -180,5 +181,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.50 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/comm/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/comm/fiche.php
  *       \ingroup    commercial, compta
  *       \brief      Page to show customer card of a third party
- *       \version    $Id: fiche.php,v 1.282 2011/08/03 00:46:27 eldy Exp $
+ *       \version    $Id: fiche.php,v 1.281 2011/07/18 10:22:22 hregis Exp $
  */
 
 require("../main.inc.php");
@@ -891,5 +892,5 @@ else
 $db->close();
 
 
-llxFooter('$Date: 2011/08/03 00:46:27 $ - $Revision: 1.282 $');
+llxFooter('$Date: 2011/07/18 10:22:22 $ - $Revision: 1.281 $');
 ?>

htdocs/comm/index.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/comm/index.php
  *	\ingroup    commercial
  *	\brief      Home page of commercial area
- *	\version    $Id: index.php,v 1.171 2011/08/03 00:46:26 eldy Exp $
+ *	\version    $Id$
  */
 
 require("../main.inc.php");
@@ -631,5 +632,5 @@ print '</table>';
 $db->close();
 
 
-llxFooter('$Date: 2011/08/03 00:46:26 $ - $Revision: 1.171 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/comm/mailing/cibles.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/comm/mailing/cibles.php
  *       \ingroup    mailing
  *       \brief      Page to define emailing targets
- *       \version    $Id: cibles.php,v 1.76 2011/08/03 00:46:33 eldy Exp $
+ *       \version    $Id$
  */
 
 require("../../main.inc.php");
@@ -514,5 +515,5 @@ if ($mil->fetch($_REQUEST["id"]) >= 0)
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.76 $');
+llxFooter('$Date$ - $Revision$');
 ?>

htdocs/comm/mailing/class/mailing.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/comm/mailing/class/mailing.class.php
  *	\ingroup    mailing
  *	\brief      Fichier de la classe de gestion des mailings
- *	\version    $Id: mailing.class.php,v 1.3 2011/08/03 00:46:38 eldy Exp $
+ *	\version    $Id$
  */
 
 require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");

htdocs/comm/mailing/fiche.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/comm/mailing/fiche.php
  *       \ingroup    mailing
  *       \brief      Fiche mailing, onglet general
- *       \version    $Id: fiche.php,v 1.123 2011/08/03 00:46:33 eldy Exp $
+ *       \version    $Id: fiche.php,v 1.122 2011/07/10 13:33:53 eldy Exp $
  */
 
 require("../../main.inc.php");
@@ -1072,5 +1073,5 @@ else
 
 $db->close();
 
-llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.123 $');
+llxFooter('$Date: 2011/07/10 13:33:53 $ - $Revision: 1.122 $');
 ?>

htdocs/comm/mailing/index.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/comm/mailing/index.php
  *       \ingroup    mailing
  *       \brief      Page accueil de la zone mailing
- *       \version    $Id: index.php,v 1.37 2011/08/03 00:46:33 eldy Exp $
+ *       \version    $Id$
  */
 
 require("../../main.inc.php");
@@ -215,6 +216,6 @@ if ($langs->file_exists("html/spam.html",0)) {
  }
 
 
-llxFooter('$Date: 2011/08/03 00:46:33 $ - $Revision: 1.37 $');
+llxFooter('$Date$ - $Revision$');
 
 ?>