Work on 3.1 packaging

2025-12-06 01:28:19 +01:00 · 2011-07-31 15:31:32 +00:00
parent 534abdc503
commit b07164305b
272 changed files with 834 additions and 804 deletions
--- a/build/.cvsignore
+++ b/build/.cvsignore
@@ -14,6 +14,3 @@ version-phpsane.txt
 makepack-phpsane.conf
 html
 *.deb
-*.dsc
-*.tar.gz
-*.changes
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \version      $Id: makepack-dolibarr.pl,v 1.128 2011/07/31 22:08:13 eldy Exp $
+# \version      $Id: makepack-dolibarr.pl,v 1.125 2011/07/31 15:31:32 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.125 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
 $VERSION="1.0 (build $REVISION)";


@@ -254,11 +254,9 @@ 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`;
@@ -416,19 +414,14 @@ if ($nboftargetok) {
    	}
    
    	if ($target eq 'RPM') {                 # Linux only
-    		#$ARCH='i386';
-    		$ARCH='noarch';
+    		$ARCH='i386';
 			if ($RPMDIR eq "") { $RPMDIR=$ENV{'HOME'}."/rpmbuild"; }
           	$newbuild = $BUILD;
-           	# For fedora
-            $newbuild =~ s/(dev|alpha)/0.1.a/gi;			# dev
-            $newbuild =~ s/beta/0.2.beta1/gi;				# beta
-            $newbuild =~ s/rc./0.3.rc1/gi;					# rc
+            $newbuild =~ s/(dev|alpha)/0/gi;				# dev
+            $newbuild =~ s/beta/1/gi;						# beta
+            $newbuild =~ s/rc./2/gi;						# rc
            if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
-            #$newbuild =~ s/(dev|alpha)/0/gi;				# dev
-            #$newbuild =~ s/beta/1/gi;						# beta
-            #$newbuild =~ s/rc./2/gi;						# rc
-            #if ($newbuild !~ /-/) { $newbuild.='-3'; }		# finale
+            # now newbuild is 0-0 or 0-3 for example
            $REL1 = $newbuild; $REL1 =~ s/-.*$//gi;
            if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; }
            print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
@@ -446,93 +439,16 @@ if ($nboftargetok) {

 			print "Remove other files\n";
            $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`;
-		    $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`;
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/aps`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/deb`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/dmg`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/doap`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/exe`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/live`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/patch`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/zip`;
+            $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/$PROJECT/build/perl`;

-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`;
-            $ret=`rm -f  $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`;
-            # To remove once stable
-            $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`;
-
-			# Apache conf files
-    		#print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`;
-    		#$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`;
-
-			# Dolibarr conf files
-			# TODO
-
-			# dolibarr.desktop
-	   		#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/applications\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/applications"`;
-    		#print "Copy desktop file into $BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop\n";
-    		#$ret=`cp "$SOURCE/build/rpm/dolibarr.desktop" "$BUILDROOT/$FILENAMETGZ2/usr/share/applications/dolibarr.desktop"`;
-            
-            # pixmap
-	   		#print "Create directory $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps\n";
-    		#$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps"`;
-    		#print "Copy pixmap file into $BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm\n";
-    		#$ret=`cp "$SOURCE/doc/images/dolibarr.xpm" "$BUILDROOT/$FILENAMETGZ2/usr/share/pixmaps/dolibarr.xpm"`;
-
-			# Set owners
-            print "Set owners on files/dir\n";
-		    $ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`;
-
-            print "Set permissions on files/dir\n";
-		    $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
-		    $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`;
-            $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-            $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; ";
-            $ret=`$cmd`;
-
-			# Build tgz
    		print "Compress $FILENAMETGZ2 into $FILENAMETGZ2.tgz...\n";
    		$ret=`tar --exclude-from "$SOURCE/build/tgz/tar_exclude.txt" --directory "$BUILDROOT" -czvf "$BUILDROOT/$FILENAMETGZ2.tgz" $FILENAMETGZ2`;

@@ -560,10 +476,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;
    	}
    	
@@ -700,7 +612,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`;

@@ -757,7 +679,7 @@ 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"`;
+			$ret=`rm -fr "$SOURCE/build/deb/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"`;
@@ -779,17 +701,11 @@ if ($nboftargetok) {
            {
                print "Move *_all.deb to $DESTI\n";
                $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
            }
            else
            {
                print "Move *_all.deb to $DESTI\n";
                $ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.dsc "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.tar.gz "$DESTI/"`;
-                $ret=`mv $BUILDROOT/*.changes "$DESTI/"`;
            }
        	next;
        }
--- a/build/rpm/README
+++ b/build/rpm/README
@@ -10,8 +10,6 @@ with format RPM (for Redhat, Mandriva, ...).

 # This is standard command to work on Debian packaging:
 #
-# rpmlint file.rpm				    Test a package
-#
 # On Fedora
 # rpm -i --test dolibarr-...rpm     To list dependencies of RPM   
 # yum install dolibarr-...rpm       To install package and dependencies   
@@ -29,22 +27,18 @@ with format RPM (for Redhat, Mandriva, ...).


 To submit a package to Fedora:
- Create account on bugzilla.redhat.com
- Create account on fedoraproject.org
- Create SRPMS package.
- Upload package onf http://fedorapeople.org
+
 - Create a bug with form https://bugzilla.redhat.com/bugzilla/enter_bug.cgi?product=Fedora&format=fedora-review
 This is example of content of review field (used for Bug 723326):
-SRPMS URL: http://www.dolibarr.org/files/fedora/dolibarr-x.y.z-xxx.src.rpm
+Spec URL: http://www.dolibarr.org/files/fedora/dolibarr.spec
+SRPM URL: http://www.dolibarr.org/files/fedora/dolibarr-3.1.0-0.src.rpm
 Description:  Dolibarr ERP & CRM is an easy to use open source/free software
 for small and medium companies, foundations or freelances. It includes
 different features for Enterprise Resource Planning (ERP) and Customer
 Relationship Management (CRM) but also for different other activities.
 I am author of other already packaged OpenSources packages (awstats) but this
 is my first package to maintain myself. So i'm seeking a sponsor.
+
 - Edit field "Block" and add FE-NEEDSPONSOR
+
 - Check bug is into database by searching with id on https://bugzilla.redhat.com/  
- Install fedora packager tools: yum install fedora-packager
- Setup fedora packagers tools: fedora-packager-setup
- Send your package: koji build --scratch f16 path_to_source_RPM
- Check if package is available: http://koji.fedoraproject.org/koji/  
--- a/build/rpm/dolibarr.desktop
+++ b/build/rpm/dolibarr.desktop
@@ -19,7 +19,7 @@ Exec=xdg-open http://localhost/dolibarr
 Icon=dolibarr
 Terminal=false
 Type=Application
-Categories=Office;
+Categories=Office
 StartupNotify=true
 InitialPreference=5
 #NoDisplay=true
--- a/build/rpm/dolibarr.spec
+++ b/build/rpm/dolibarr.spec
@@ -20,7 +20,7 @@ Vendor: Dolibarr dev team

 URL: http://www.%{name}.org
 Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz
-BuildArch: noarch
+#BuildArch: noarch
 #BuildArchitectures: noarch
 BuildRoot: /tmp/%{name}-buildroot
 #Icon: dolibarr_logo1.gif
@@ -48,7 +48,7 @@ AutoReqProv: no


 %description
-An easy to use CRM & ERP open source/free software for small  
+Dolibarr ERP & CRM is an easy to use open source/free software for small  
 and medium companies, foundations or freelances. It includes different 
 features for Enterprise Resource Planning (ERP) and Customer Relationship 
 Management (CRM) but also for different other activities.
@@ -56,7 +56,7 @@ Dolibarr was designed to provide only features you need and be easy to
 use.

 %description -l es
-Un software ERP y CRM open source/gratis para pequeñas y
+Dolibarr ERP y CRM es un software open source/gratis para pequeñas y
 medianas empresas, asociaciones o autónomos. Incluye diferentes
 funcionalidades para la Planificación de Recursos Empresariales (ERP) y
 Gestión de la Relación con los Clientes (CRM) así como para para otras
@@ -65,13 +65,13 @@ solamente las funcionalidades que necesita y haciendo hincapié en su
 facilidad de uso.
    
 %description -l fr
-Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, 
+Dolibarr ERP & CRM est un logiciel de gestion de PME/PMI, autoentrepreneurs, 
 artisans ou associations. Il permet de gérer vos clients, prospect, 
 fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings
 et bien d'autres choses dans une interface pensée pour la simplicité.

 %description -l it
-Un programma gestionale open source e gratuito per piccole e medie
+Dolibarr è un programma gestionale open source e gratuito per piccole e medie
 imprese, fondazioni e liberi professionisti. Include varie funzionalità per
 Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori
 attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno 
@@ -101,7 +101,6 @@ mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc
 mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs
 mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts

-# %{_datadir} = /usr/share
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -154,8 +153,6 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install"
 export installconfig="%{_sysconfdir}/dolibarr/install.forced.php"
 export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf"
 export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf"
-export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr"
-export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr"
 #config="/usr/share/dolibarr/htdocs/conf/conf.php"
 config="%{_sysconfdir}/dolibarr/conf.php"
 lockfile="/usr/share/dolibarr/install.lock"
@@ -221,7 +218,7 @@ then
 	chmod -R 660 $config
 fi

-# Create config file for apache $apacheconfig
+# Create a config file $apacheconfig
 if [ ! -f $apacheconfig ]; then
  	 echo Create dolibarr web server config file $apacheconfig
     cp $apachefileorig $apacheconfig
@@ -229,15 +226,7 @@ if [ ! -f $apacheconfig ]; then
     chmod go-w $apacheconfig
 fi

-# Create config file for se $seconfig
-if [ ! -f $seconfig ]; then
-  	 echo Create se config file $seconfig
-     cp $sefileorig $seconfig
-#     chmod a-x $apacheconfig
-#     chmod go-w $apacheconfig
-fi
-
-# Create a config link dolibarr.conf
+# Create a config link dolibarr.conf for Fedora or Redhat
 if [ ! -f $apachelink ]; then
    echo Create dolibarr web server config link $apachelink
    ln -fs $apacheconfig $apachelink
@@ -356,19 +345,12 @@ then
 fi

 # Removed dirs after apache restart
-echo Removed remaining $apacheconfig
+echo Removed remaining dirs
 rm -f $apacheconfig
-echo Removed remaining $config
 rm -f $config
-echo Removed remaining $installconfig
 rm -f $installconfig
-echo Removed remaining $lockfile
 rm -f $lockfile
-echo Removed remaining dir $targetdir/doc
 rmdir $targetdir/doc >/dev/null 2>&1
-#echo Removed remaining dir $targetdir/htdocs
-#rmdir $targetdir/htdocs >/dev/null 2>&1	# Already removed by rpm
+rmdir $targetdir/htdocs >/dev/null 2>&1

 %changelog
-* Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1
- Initial version (#723326)
--- a/build/rpm/file_contexts.dolibarr
+++ b/build/rpm/file_contexts.dolibarr
@@ -1,3 +0,0 @@
-/etc/dolibarr/.*	system_u:object_r:httpd_sys_script_rw_t:s0
-/var/www/dolibarr/.*	system_u:object_r:httpd_sys_script_rw_t:s0
-/usr/share/dolibarr/.*	system_u:object_r:httpd_sys_script_rw_t:s0
--- a/dev/initdata/generate-commande.php
+++ b/dev/initdata/generate-commande.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.
 *
 * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
 */
@@ -22,7 +23,7 @@
 /**
 	    \file       htdocs/dev/generate-commande.php
 		\brief      Script de generation de donnees aleatoires pour les commandes
-		\version    $Id: generate-commande.php,v 1.18 2011/07/31 22:21:57 eldy Exp $
+		\version    $Id: generate-commande.php,v 1.17 2011/07/09 14:11:40 eldy Exp $
 */

 // Test si mode batch
--- a/dev/initdata/generate-facture.php
+++ b/dev/initdata/generate-facture.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.
 *
 * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
 */
@@ -21,7 +22,7 @@
 /**
 *	    \file       htdocs/dev/generate-facture.php
 *		\brief      Script de generation de donnees aleatoires pour les factures
- *		\version    $Id: generate-facture.php,v 1.15 2011/07/31 22:21:57 eldy Exp $
+ *		\version    $Id: generate-facture.php,v 1.14 2011/07/09 14:11:40 eldy Exp $
 */

 // Test si mode batch
--- a/dev/initdata/generate-produit.php
+++ b/dev/initdata/generate-produit.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.
 *
 * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
 */
@@ -22,7 +23,7 @@
 /**
 *      \file       htdocs/dev/generate-produit.php
 *		\brief      Script de generation de donnees aleatoires pour les produits
- *		\version    $Id: generate-produit.php,v 1.17 2011/07/31 22:21:57 eldy Exp $
+ *		\version    $Id: generate-produit.php,v 1.16 2011/07/09 14:11:40 eldy Exp $
 */

 // Test si mode batch
--- a/dev/initdata/generate-propale.php
+++ b/dev/initdata/generate-propale.php
@@ -14,7 +14,8 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *
 * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
 */
@@ -22,7 +23,7 @@
 /**
 *	    \file       htdocs/dev/generate-propale.php
 *		\brief      Script de generation de donnees aleatoires pour les propales
- *		\version    $Id: generate-propale.php,v 1.16 2011/07/31 22:21:57 eldy Exp $
+ *		\version    $Id: generate-propale.php,v 1.15 2011/07/09 14:11:40 eldy Exp $
 */

 // Test si mode batch
--- a/dev/initdata/generate-societe.php
+++ b/dev/initdata/generate-societe.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.
 *
 * ATTENTION DE PAS EXECUTER CE SCRIPT SUR UNE INSTALLATION DE PRODUCTION
 */
@@ -22,7 +23,7 @@
 /**
 *      \file       htdocs/dev/generate-societe.php
 *		\brief      Script de generation de donnees aleatoires pour les societes
- *		\version    $Id: generate-societe.php,v 1.17 2011/07/31 22:21:57 eldy Exp $
+ *		\version    $Id: generate-societe.php,v 1.16 2011/07/09 14:11:40 eldy Exp $
 */

 // Test si mode batch
--- a/dev/samples/create_invoice.php
+++ b/dev/samples/create_invoice.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       dev/samples/manage_order.php
 *      \brief      This file is an example for a command line script
- *      \version    $Id: create_invoice.php,v 1.6 2011/07/31 22:21:59 eldy Exp $
+ *      \version    $Id: create_invoice.php,v 1.5 2011/07/09 14:11:41 eldy Exp $
 *		\author		Put author name here
 *		\remarks	Put here some comments
 */
@@ -35,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }

 // Global variables
-$version='$Revision: 1.6 $';
+$version='$Revision: 1.5 $';
 $error=0;


--- a/dev/samples/create_order.php
+++ b/dev/samples/create_order.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       dev/samples/manage_order.php
 *      \brief      This file is an example for a command line script
- *      \version    $Id: create_order.php,v 1.10 2011/07/31 22:21:59 eldy Exp $
+ *      \version    $Id: create_order.php,v 1.9 2011/07/09 14:11:41 eldy Exp $
 *		\author		Put author name here
 *		\remarks	Put here some comments
 */
@@ -35,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }

 // Global variables
-$version='$Revision: 1.10 $';
+$version='$Revision: 1.9 $';
 $error=0;


--- a/dev/samples/create_product.php
+++ b/dev/samples/create_product.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       dev/samples/create_product.php
 *      \brief      This file is an example for a command line script
- *      \version    $Id: create_product.php,v 1.9 2011/07/31 22:21:59 eldy Exp $
+ *      \version    $Id: create_product.php,v 1.8 2011/07/09 14:11:41 eldy Exp $
 *		\author		Put author name here
 *		\remarks	Put here some comments
 */
@@ -35,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }

 // Global variables
-$version='$Revision: 1.9 $';
+$version='$Revision: 1.8 $';
 $error=0;


--- a/dev/skeletons/build_class_from_table.php
+++ b/dev/skeletons/build_class_from_table.php
@@ -1,6 +1,6 @@
 #!/usr/bin/php
 <?php
-/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
 *
 * 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
@@ -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       dev/skeletons/build_class_from_table.php
 *  \ingroup    core
 *  \brief      Create a complete class file from a table in database
- *  \version    $Id: build_class_from_table.php,v 1.33 2011/07/31 22:21:58 eldy Exp $
+ *  \version    $Id: build_class_from_table.php,v 1.32 2011/07/09 14:11:40 eldy Exp $
 */

 $sapi_type = php_sapi_name();
@@ -38,7 +39,7 @@ require_once($path."../../htdocs/master.inc.php");
 // After this $db is a defined handler to database.

 // Main
-$version='$Revision: 1.33 $';
+$version='$Revision: 1.32 $';
@set_time_limit(0);
 $error=0;

--- a/dev/skeletons/build_webservice_from_class.php
+++ b/dev/skeletons/build_webservice_from_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       dev/skeletons/build_webservice_from_class.php
 *  \ingroup    core
 *  \brief      Create a complete webservice file from CRUD functions of a PHP class
- *  \version    $Id: build_webservice_from_class.php,v 1.7 2011/07/31 22:21:58 eldy Exp $
+ *  \version    $Id: build_webservice_from_class.php,v 1.6 2011/07/09 14:11:40 eldy Exp $
 */

 $sapi_type = php_sapi_name();
@@ -38,7 +39,7 @@ require_once($path."../../htdocs/master.inc.php");
 // After this $db is a defined handler to database.

 // Main
-$version='$Revision: 1.7 $';
+$version='$Revision: 1.6 $';
@set_time_limit(0);
 $error=0;

--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.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.
 */

 /**
@@ -27,7 +28,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$
 */
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");

--- a/dev/skeletons/skeleton_class.class.php
+++ b/dev/skeletons/skeleton_class.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       dev/skeletons/skeleton_class.class.php
 *      \ingroup    mymodule othermodule1 othermodule2
 *      \brief      This file is an example for a CRUD class file (Create/Read/Update/Delete)
- *		\version    $Id: skeleton_class.class.php,v 1.32 2011/07/31 22:21:58 eldy Exp $
+ *		\version    $Id$
 *		\author		Put author name here
 *		\remarks	Put here some comments
 */
--- a/dev/skeletons/skeleton_page.php
+++ b/dev/skeletons/skeleton_page.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       dev/skeletons/skeleton_page.php
 *		\ingroup    mymodule othermodule1 othermodule2
 *		\brief      This file is an example of a php page
- *		\version    $Id: skeleton_page.php,v 1.19 2011/07/31 22:21:57 eldy Exp $
+ *		\version    $Id$
 *		\author		Put author name here
 *		\remarks	Put here some comments
 */
@@ -113,5 +114,5 @@ $somethingshown=$myobject->showLinkedObjectBlock();

 // End of page
 $db->close();
-llxFooter('$Date: 2011/07/31 22:21:57 $ - $Revision: 1.19 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/dev/skeletons/skeleton_script.php
+++ b/dev/skeletons/skeleton_script.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       dev/skeletons/skeleton_script.php
 *		\ingroup    mymodule othermodule1 othermodule2
 *      \brief      This file is an example for a command line script
- *      \version    $Id: skeleton_script.php,v 1.28 2011/07/31 22:21:58 eldy Exp $
+ *      \version    $Id: skeleton_script.php,v 1.27 2011/07/09 14:11:41 eldy Exp $
 *		\author		Put author name here
 *		\remarks	Put here some comments
 */
@@ -37,7 +38,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 }

 // Global variables
-$version='$Revision: 1.28 $';
+$version='$Revision: 1.27 $';
 $error=0;


--- a/dev/translation/autotranslator.php
+++ b/dev/translation/autotranslator.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       dev/translation/autotranslator.php
 *		\ingroup    mymodule othermodule1 othermodule2
 *      \brief      This file is an example for a command line script
- *      \version    $Id: autotranslator.php,v 1.13 2011/07/31 22:21:59 eldy Exp $
+ *      \version    $Id: autotranslator.php,v 1.12 2011/07/09 14:11:41 eldy Exp $
 * 		\author		Put author name here
 *		\remarks	Put here some comments
 */
@@ -44,7 +45,7 @@ require_once($path.'../../htdocs/lib/files.lib.php');
 $langs->load("main");

 // Global variables
-$version='$Revision: 1.13 $';
+$version='$Revision: 1.12 $';
 $error=0;


--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -1 +0,0 @@
-Url not available
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.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/card_subscriptions.php
 *       \ingroup    member
 *       \brief      Onglet d'ajout, edition, suppression des adhesions d'un adherent
- *       \version    $Id: card_subscriptions.php,v 1.79 2011/07/31 22:23:28 eldy Exp $
+ *       \version    $Id$
 */

 require("../main.inc.php");
@@ -995,5 +996,5 @@ else

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.79 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/adherents/cartes/index.php
+++ b/htdocs/adherents/cartes/index.php
@@ -1 +0,0 @@
-Url not available
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.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/cotisations.php
 *      \ingroup    member
 *		\brief      Page de consultation et insertion d'une cotisation
- *		\version    $Id: cotisations.php,v 1.58 2011/07/31 22:23:28 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -228,5 +229,5 @@ else

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.58 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.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/adherents/document.php
 *  \brief      Tab for documents linked to third party
 *  \ingroup    societe
- *  \version    $Id: document.php,v 1.9 2011/07/31 22:23:28 eldy Exp $
+ *  \version    $Id: document.php,v 1.8 2011/07/06 20:56:50 eldy Exp $
 */

 require("../main.inc.php");
@@ -230,6 +231,6 @@ else
 $db->close();


-llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.9 $');
+llxFooter('$Date: 2011/07/06 20:56:50 $ - $Revision: 1.8 $');

 ?>
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/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/adherents/fiche.php
 *       \ingroup    member
 *       \brief      Page of member
- *       \version    $Id: fiche.php,v 1.238 2011/07/31 22:23:27 eldy Exp $
+ *       \version    $Id: fiche.php,v 1.237 2011/07/13 11:50:33 eldy Exp $
 */

 require("../main.inc.php");
@@ -1504,5 +1505,5 @@ if ($rowid && $action != 'edit')

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:27 $ - $Revision: 1.238 $');
+llxFooter('$Date: 2011/07/13 11:50:33 $ - $Revision: 1.237 $');
 ?>
--- a/htdocs/adherents/fiche_subscription.php
+++ b/htdocs/adherents/fiche_subscription.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/adherents/fiche_subscription.php
 *       \ingroup    member
 *       \brief      Page d'ajout, edition, suppression d'une fiche adh<64>sion
- *       \version    $Id: fiche_subscription.php,v 1.30 2011/07/31 22:23:28 eldy Exp $
+ *       \version    $Id$
 */

 require("../main.inc.php");
@@ -392,5 +393,5 @@ if ($rowid && $action != 'edit')

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.30 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.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      Page d'export htpasswd du fichier des adherents
 *      \author     Rodolphe Quiedeville
- *      \version    $Id: htpasswd.php,v 1.15 2011/07/31 22:23:28 eldy Exp $
+ *      \version    $Id$
 */

 require("../main.inc.php");
@@ -81,5 +82,5 @@ else

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.15 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.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.
 */

 /**
@@ -344,5 +345,5 @@ print '</table>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.72 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/adherents/info.php
+++ b/htdocs/adherents/info.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/info.php
 *      \ingroup    member
 *		\brief      Page des informations d'un adherent
- *		\version    $Id: info.php,v 1.15 2011/07/31 22:23:28 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -62,5 +63,5 @@ print '</div>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.15 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/adherents/info_subscription.php
+++ b/htdocs/adherents/info_subscription.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/info.php
 *      \ingroup    member
 *		\brief      Page des informations d'un adherent
- *		\version    $Id: info_subscription.php,v 1.12 2011/07/31 22:23:28 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -80,5 +81,5 @@ print '</div>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.12 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.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/ldap.php
 *       \ingroup    ldap member
 *       \brief      Page fiche LDAP adherent
- *       \version    $Id: ldap.php,v 1.32 2011/07/31 22:23:27 eldy Exp $
+ *       \version    $Id$
 */

 require("../main.inc.php");
@@ -232,5 +233,5 @@ print '</table>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:27 $ - $Revision: 1.32 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/adherents/liste.php
+++ b/htdocs/adherents/liste.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/liste.php
 *      \ingroup    member
 *		\brief      Page to list all members of foundation
- *		\version    $Id: liste.php,v 1.84 2011/07/31 22:23:28 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -346,5 +347,5 @@ else

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.84 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.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/note.php
 *      \ingroup    member
 *      \brief      Fiche de notes sur un adherent
- *		\version    $Id: note.php,v 1.29 2011/07/31 22:23:28 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -178,5 +179,5 @@ if ($id)

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.29 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.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/adherents/type.php
 *      \ingroup    member
 *		\brief      Page de configuration des types d'adherents
- *		\version    $Id: type.php,v 1.70 2011/07/31 22:23:27 eldy Exp $
+ *		\version    $Id: type.php,v 1.69 2011/06/26 21:03:44 eldy Exp $
 */

 require("../main.inc.php");
@@ -636,5 +637,5 @@ if ($rowid > 0)

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:27 $ - $Revision: 1.70 $');
+llxFooter('$Date: 2011/06/26 21:03:44 $ - $Revision: 1.69 $');
 ?>
--- a/htdocs/admin/accounting.php
+++ b/htdocs/admin/accounting.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/accounting.php
 *      \ingroup    accounting
 *      \brief      Page de configuration du module comptabilite expert
- *		\version    $Id: accounting.php,v 1.3 2011/07/31 22:23:26 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -168,6 +169,6 @@ if ($result)
 $db->close();


-llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.3 $');
+llxFooter('$Date$ - $Revision$');

 ?>
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.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/agenda.php
 *      \ingroup    agenda
 *      \brief      Autocreate actions for agenda module setup page
- *      \version    $Id: agenda.php,v 1.23 2011/07/31 22:23:23 eldy Exp $
+ *      \version    $Id$
 */

 require("../main.inc.php");
@@ -159,5 +160,5 @@ print "<br>";

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:23 $ - $Revision: 1.23 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.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/agenda_extsites.php
 *      \ingroup    agenda
 *      \brief      Page to setup external calendars for agenda module
- *      \version    $Id: agenda_extsites.php,v 1.9 2011/07/31 22:23:21 eldy Exp $
+ *      \version    $Id$
 */

 require("../main.inc.php");
@@ -192,5 +193,5 @@ dol_htmloutput_mesg($mesg);

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.9 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.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/agenda_xcal.php
 *      \ingroup    agenda
 *      \brief      Page to setup miscellaneous options of agenda module
- *		\version    $Id: agenda_xcal.php,v 1.23 2011/07/31 22:23:25 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -149,5 +150,5 @@ print info_admin($message);

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.23 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -14,13 +14,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *   \file       htdocs/admin/boxes.php
 *   \brief      Page to setup boxes
- *   \version    $Id: boxes.php,v 1.72 2011/07/31 22:23:22 eldy Exp $
+ *   \version    $Id$
 */

 require("../main.inc.php");
@@ -470,5 +471,5 @@ print '</table>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.72 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.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/clicktodial.php
 *   \ingroup    clicktodial
 *   \brief      Page to setup module clicktodial
- *   \version    $Id: clicktodial.php,v 1.24 2011/07/31 22:23:24 eldy Exp $
+ *   \version    $Id$
 */

 require("../main.inc.php");
@@ -95,5 +96,5 @@ print '</table></form>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.24 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.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/admin/commande.php
 *	\ingroup    commande
 *	\brief      Setup page of module Order
- *	\version    $Id: commande.php,v 1.75 2011/07/31 22:23:25 eldy Exp $
+ *	\version    $Id$
 */

 require("../main.inc.php");
@@ -521,5 +522,5 @@ print '</table>';

 print '<br>';

-llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.75 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.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/admin/company.php
 *	\ingroup    company
 *	\brief      Setup page to configure company/foundation
- *	\version    $Id: company.php,v 1.94 2011/07/31 22:23:24 eldy Exp $
+ *	\version    $Id: company.php,v 1.93 2011/07/18 18:09:04 eldy Exp $
 */

 require("../main.inc.php");
@@ -982,6 +983,6 @@ else

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.94 $');
+llxFooter('$Date: 2011/07/18 18:09:04 $ - $Revision: 1.93 $');

 ?>
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.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/admin/compta.php
 *	\ingroup    compta
 *	\brief      Page to setup accountancy module
- *	\version    $Id: compta.php,v 1.33 2011/07/31 22:23:22 eldy Exp $
+ *	\version    $Id$
 */

 require("../main.inc.php");
@@ -186,5 +187,5 @@ if ($num)
 $db->close();


-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.33 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.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/admin/confexped.php
 *		\ingroup    produit
 *		\brief      Page to setup sending module
- *		\version    $Id: confexped.php,v 1.22 2011/07/31 22:23:21 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.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/admin/const.php
 *	\ingroup    setup
 *	\brief      Admin page to define miscellaneous constants
- *	\version    $Id: const.php,v 1.70 2011/07/31 22:23:21 eldy Exp $
+ *	\version    $Id$
 */

 require("../main.inc.php");
@@ -279,5 +280,5 @@ print "</form>\n";

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.70 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.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/contract.php
 *	\ingroup    contract
 *	\brief      Setup page of module Contracts
- *	\version    $Id: contract.php,v 1.5 2011/07/31 22:23:25 eldy Exp $
+ *	\version    $Id$
 */

 require("../main.inc.php");
@@ -173,5 +174,5 @@ if (is_resource($handle))
 print '</table><br>';
 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.5 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -15,13 +15,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *   	\file       htdocs/admin/delais.php
 *		\brief      Page to setup late delays
- *		\version    $Id: delais.php,v 1.32 2011/07/31 22:23:21 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -371,5 +372,5 @@ print '</table>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.32 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.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/admin/dict.php
 *		\ingroup    setup
 *		\brief      Page to administer data tables
- *		\version    $Id: dict.php,v 1.146 2011/07/31 22:23:22 eldy Exp $
+ *		\version    $Id: dict.php,v 1.145 2011/06/25 09:50:56 eldy Exp $
 */

 require("../main.inc.php");
@@ -896,7 +897,7 @@ print '<br>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.146 $');
+llxFooter('$Date: 2011/06/25 09:50:56 $ - $Revision: 1.145 $');


 /**
--- a/htdocs/admin/dons.php
+++ b/htdocs/admin/dons.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/dons.php
 *		\ingroup    dons
 *		\brief      Page d'administration/configuration du module Dons
- *		\version    $Id: dons.php,v 1.26 2011/07/31 22:23:21 eldy Exp $
+ *		\version    $Id$
 */
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
@@ -275,5 +276,5 @@ print "<br>";

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.26 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/events.php
+++ b/htdocs/admin/events.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/events.php
 *      \ingroup    core
 *      \brief      Log event setup page
- *		\version    $Id: events.php,v 1.21 2011/07/31 22:23:24 eldy Exp $
+ *		\version    $Id: events.php,v 1.20 2011/07/18 23:30:56 eldy Exp $
 */

 require("../main.inc.php");
@@ -123,5 +124,5 @@ dol_htmloutput_mesg($mesg);

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.21 $');
+llxFooter('$Date: 2011/07/18 23:30:56 $ - $Revision: 1.20 $');
 ?>
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.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/admin/expedition.php
 *	\ingroup    expedition
 *	\brief      Page d'administration/configuration du module Expedition
- *	\version    $Id: expedition.php,v 1.70 2011/07/31 22:23:22 eldy Exp $
+ *	\version    $Id$
 */

 require("../main.inc.php");
--- a/htdocs/admin/external_rss.php
+++ b/htdocs/admin/external_rss.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/admin/external_rss.php
 *      \ingroup    external_rss
 *      \brief      Page d'administration/configuration du module ExternalRss
- *      \version    $Id: external_rss.php,v 1.48 2011/07/31 22:23:21 eldy Exp $
+ *      \version    $Id$
 */

 require("../main.inc.php");
@@ -316,5 +317,5 @@ print '</table>'."\n";

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.48 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.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/admin/facture.php
 *		\ingroup    facture
 *		\brief      Page to setup invoice module
- *		\version    $Id: facture.php,v 1.150 2011/07/31 22:23:25 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -718,5 +719,5 @@ print "</table>\n";

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.150 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.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: fckeditor.php,v 1.32 2011/07/31 22:23:24 eldy Exp $
+ * $Id$
 */

 /**
 *  \file       htdocs/admin/fckeditor.php
 *  \ingroup    fckeditor
 *  \brief      Page d'activation du module FCKeditor dans les autres modules
- *  \version    $Revision: 1.32 $
+ *  \version    $Revision$
 */

 require("../main.inc.php");
@@ -175,5 +176,5 @@ print $conf->global->FCKEDITOR_TEST;

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.32 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.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/admin/fichinter.php
 *	\ingroup    fichinter
 *	\brief      Setup page of module Interventions
- *	\version    $Id: fichinter.php,v 1.62 2011/07/31 22:23:22 eldy Exp $
+ *	\version    $Id$
 */

 require("../main.inc.php");
@@ -452,5 +453,5 @@ print '<br>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.62 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/fournisseur.php
+++ b/htdocs/admin/fournisseur.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/admin/fournisseur.php
 *  \ingroup    fournisseur
 *  \brief      Page d'administration-configuration du module Fournisseur
- *  \version    $Id: fournisseur.php,v 1.63 2011/07/31 22:23:21 eldy Exp $
+ *  \version    $Id$
 */

 require("../main.inc.php");
@@ -617,5 +618,5 @@ print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'
 print "</td></tr>\n";
 print '</form>';

-llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.63 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.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/geoipmaxmind.php
 *	\ingroup    geoipmaxmind
 *	\brief      Setup page for geoipmaxmind module
- *	\version    $Id: geoipmaxmind.php,v 1.3 2011/07/31 22:23:22 eldy Exp $
+ *	\version    $Id$
 */

 require("../main.inc.php");
@@ -127,5 +128,5 @@ if ($geoip)
 	$geoip->close();
 }

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.3 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -14,13 +14,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *       \file       htdocs/admin/ihm.php
 *       \brief      Page to setup GUI display options
- *       \version    $Id: ihm.php,v 1.130 2011/07/31 22:23:24 eldy Exp $
+ *       \version    $Id$
 */

 require("../main.inc.php");
@@ -526,5 +527,5 @@ else	// Show

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.130 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/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/index.php
 *		\brief      Page d'accueil de l'espace administration/configuration
- *		\version    $Id: index.php,v 1.83 2011/07/31 22:23:25 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -84,5 +85,5 @@ print '</table>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.83 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.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/admin/ldap.php
 *      \ingroup    ldap
 *      \brief      Page d'administration/configuration du module Ldap
- *      \version    $Id: ldap.php,v 1.84 2011/07/31 22:23:24 eldy Exp $
+ *      \version    $Id$
 */

 require("../main.inc.php");
@@ -319,5 +320,5 @@ if (function_exists("ldap_connect"))

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.84 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.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/admin/ldap_contacts.php
 *  \ingroup    ldap
 *  \brief      Page d'administration/configuration du module Ldap
- *  \version    $Id: ldap_contacts.php,v 1.38 2011/07/31 22:23:26 eldy Exp $
+ *  \version    $Id$
 */

 require("../main.inc.php");
@@ -323,6 +324,6 @@ if (function_exists("ldap_connect"))

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.38 $');
+llxFooter('$Date$ - $Revision$');

 ?>
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.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/admin/ldap_groups.php
 *     	\ingroup    ldap
 *		\brief      Page to setup LDAP synchronization for groups
- *     	\version    $Id: ldap_groups.php,v 1.34 2011/07/31 22:23:22 eldy Exp $
+ *     	\version    $Id$
 */

 require("../main.inc.php");
@@ -248,5 +249,5 @@ if (function_exists("ldap_connect"))

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.34 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/ldap_members.php
+++ b/htdocs/admin/ldap_members.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/admin/ldap_members.php
 *		\ingroup    ldap member
 *		\brief      Page d'administration/configuration du module Ldap adherent
- *		\version    $Id: ldap_members.php,v 1.35 2011/07/31 22:23:22 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -431,5 +432,5 @@ if (function_exists("ldap_connect"))

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.35 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/ldap_users.php
+++ b/htdocs/admin/ldap_users.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/admin/ldap_users.php
 *		\ingroup    ldap
 *		\brief      Page d'administration/configuration du module Ldap
- *		\version    $Id: ldap_users.php,v 1.37 2011/07/31 22:23:22 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -340,5 +341,5 @@ if (function_exists("ldap_connect"))

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.37 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -14,13 +14,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *       \file       htdocs/admin/limits.php
 *       \brief      Page de configuration des limites
- *       \version    $Id: limits.php,v 1.22 2011/07/31 22:23:21 eldy Exp $
+ *       \version    $Id$
 */

 require("../main.inc.php");
@@ -209,5 +210,5 @@ print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparr

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.22 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/livraison.php
+++ b/htdocs/admin/livraison.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/admin/livraison.php
 *      \ingroup    livraison
 *      \brief      Page d'administration/configuration du module Livraison
- *      \version    $Id: livraison.php,v 1.57 2011/07/31 22:23:21 eldy Exp $
+ *      \version    $Id$
 */
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.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/mailing.php
 *		\ingroup    mailing
 *		\brief      Page to setup emailing module
- *		\version    $Id: mailing.php,v 1.14 2011/07/31 22:23:25 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -95,6 +96,6 @@ print '</table></form>';
 $db->close();


-llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.14 $');
+llxFooter('$Date$ - $Revision$');

 ?>
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.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/mails.php
 *       \brief      Page to setup emails sending
- *       \version    $Id: mails.php,v 1.75 2011/07/31 22:23:22 eldy Exp $
+ *       \version    $Id: mails.php,v 1.74 2011/07/20 13:01:04 eldy Exp $
 */

 require("../main.inc.php");
@@ -746,5 +747,5 @@ else

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.75 $');
+llxFooter('$Date: 2011/07/20 13:01:04 $ - $Revision: 1.74 $');
 ?>
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.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/admin/menus.php
 *      \ingroup    core
 *      \brief      Page to setup menu manager to use
- *		\version	$Id: menus.php,v 1.51 2011/07/31 22:23:23 eldy Exp $
+ *		\version	$Id$
 */

 require("../main.inc.php");
@@ -248,5 +249,5 @@ if (! isset($_GET["action"]) || $_GET["action"] != 'edit')

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:23 $ - $Revision: 1.51 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.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/admin/menus/edit.php
 *		\ingroup    core
 *		\brief      Tool to edit menus
- *		\version	$Id: edit.php,v 1.42 2011/07/31 22:23:15 eldy Exp $
+ *		\version	$Id$
 */

 require("../../main.inc.php");
@@ -418,5 +419,5 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit')

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:15 $ - $Revision: 1.42 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/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/admin/menus/index.php
 *  \ingroup    core
 *  \brief      Index page for menu editor
- *  \version    $Id: index.php,v 1.45 2011/07/31 22:23:15 eldy Exp $
+ *  \version    $Id$
 */

 require("../../main.inc.php");
@@ -342,4 +343,4 @@ $db->close();

 print '<br>';

-llxFooter('$Date: 2011/07/31 22:23:15 $ - $Revision: 1.45 $');
+llxFooter('$Date$ - $Revision$');
--- a/htdocs/admin/menus/menu.js.php
+++ b/htdocs/admin/menus/menu.js.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/menus/menu.js.php
 *		\brief      File for js menu
- *		\version    $Id: menu.js.php,v 1.9 2011/07/31 22:23:15 eldy Exp $
+ *		\version    $Id$
 */


--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.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/menus/other.php
 *      \ingroup    core
 *      \brief      Menus options setup
- *		\version    $Id: other.php,v 1.6 2011/07/31 22:23:15 eldy Exp $
+ *		\version    $Id$
 */

 require("../../main.inc.php");
@@ -142,5 +143,5 @@ print '</table>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:15 $ - $Revision: 1.6 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -16,13 +16,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *  \file       htdocs/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$
 */

 require("../main.inc.php");
@@ -449,5 +450,5 @@ print '</div>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.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/notification.php
 *		\ingroup    notification
 *		\brief      Page to setup notification module
- *		\version    $Id: notification.php,v 1.13 2011/07/31 22:23:25 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -121,6 +122,6 @@ print '</table>';
 $db->close();


-llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.13 $');
+llxFooter('$Date$ - $Revision$');

 ?>
--- a/htdocs/admin/osc-languages.php
+++ b/htdocs/admin/osc-languages.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/osc-languages.php
 * \ingroup    	boutique
 * \brief      	Page d'administration/configuration du module Boutique
- * \version    	$Id: osc-languages.php,v 1.16 2011/07/31 22:23:22 eldy Exp $
+ * \version    	$Id$
 */

 require("../main.inc.php");
@@ -89,5 +90,5 @@ print "</TABLE>";

 $db->close();

-llxFooter("<em>Derni&egrave;re modification $Date: 2011/07/31 22:23:22 $ r&eacute;vision $Revision: 1.16 $</em>");
+llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
 ?>
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.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/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$
 */

 require("../main.inc.php");
@@ -194,5 +195,5 @@ print '</div>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.42 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.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/admin/prelevement.php
 *	\ingroup    prelevement
 *	\brief      Page configuration des prelevements
- *	\version    $Id: prelevement.php,v 1.18 2011/07/31 22:23:25 eldy Exp $
+ *	\version    $Id$
 */

 require('../main.inc.php');
@@ -245,5 +246,5 @@ print '</form>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.18 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/project.php
+++ b/htdocs/admin/project.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/project.php
 *  \ingroup    project
 *  \brief      Page d'administration-configuration du module Projet
- *  \version    $Id: project.php,v 1.14 2011/07/31 22:23:25 eldy Exp $
+ *  \version    $Id$
 */

 require("../main.inc.php");
@@ -379,5 +380,5 @@ if (is_resource($handle))

 print '</table><br/>';

-llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.14 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/propale.php
+++ b/htdocs/admin/propale.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/admin/propale.php
 *		\ingroup    propale
 *		\brief      Page d'administration/configuration du module Propale
- *		\version    $Id: propale.php,v 1.108 2011/07/31 22:23:25 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -543,5 +544,5 @@ print "</table>\n<br>";

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:25 $ - $Revision: 1.108 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -12,14 +12,15 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *   	\file       htdocs/admin/proxy.php
 *      \ingroup    core
 *		\brief      Page  setup proxy to use for external web access
- *		\version    $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $
+ *		\version    $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $
 */

 require("../main.inc.php");
@@ -205,5 +206,5 @@ dol_htmloutput_mesg($mesg);

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $');
+llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $');
 ?>
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -13,14 +13,15 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *		\file       htdocs/admin/security.php
 *      \ingroup    setup
 *      \brief      Page de configuration du module securite
- *		\version    $Id: security.php,v 1.56 2011/07/31 22:23:24 eldy Exp $
+ *		\version    $Id$
 */

 require("../main.inc.php");
@@ -431,5 +432,5 @@ print '</div>';

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.56 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -13,14 +13,15 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	    \file       htdocs/admin/security_other.php
 *      \ingroup    core
 *      \brief      Security options setup
- *		\version    $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $
+ *		\version    $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $
 */

 require("../main.inc.php");
@@ -347,5 +348,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs-

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $');
+llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $');
 ?>
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.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/sms.php
 *       \brief      Page to setup emails sending
- *       \version    $Id: sms.php,v 1.9 2011/07/31 22:23:22 eldy Exp $
+ *       \version    $Id: sms.php,v 1.8 2011/07/18 11:31:54 eldy Exp $
 */

 require("../main.inc.php");
@@ -346,5 +347,5 @@ else

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.9 $');
+llxFooter('$Date: 2011/07/18 11:31:54 $ - $Revision: 1.8 $');
 ?>
--- a/htdocs/admin/societe.php
+++ b/htdocs/admin/societe.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/admin/societe.php
 *	\ingroup    company
 *	\brief      Third party module setup page
- *	\version    $Id: societe.php,v 1.61 2011/07/31 22:23:23 eldy Exp $
+ *	\version    $Id: societe.php,v 1.60 2011/07/04 07:38:22 eldy Exp $
 */

 require("../main.inc.php");
@@ -498,5 +499,5 @@ dol_fiche_end();

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:23 $ - $Revision: 1.61 $');
+llxFooter('$Date: 2011/07/04 07:38:22 $ - $Revision: 1.60 $');
 ?>
--- a/htdocs/admin/societe_extrafields.php
+++ b/htdocs/admin/societe_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/admin/societe_extrafields.php
 *		\ingroup    societe
 *		\brief      Page to setup extra fields of third party
- *		\version    $Id: societe_extrafields.php,v 1.6 2011/07/31 22:23:21 eldy Exp $
+ *		\version    $Id: societe_extrafields.php,v 1.5 2011/07/05 20:43:25 eldy Exp $
 */

 require("../main.inc.php");
@@ -311,5 +312,5 @@ if ($_GET["attrname"] && $action == 'edit')

 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.6 $');
+llxFooter('$Date: 2011/07/05 20:43:25 $ - $Revision: 1.5 $');
 ?>
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.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/admin/stock.php
 *	\ingroup    stock
 *	\brief      Page d'administration/configuration du module gestion de stock
- *	\version    $Id: stock.php,v 1.24 2011/07/31 22:23:22 eldy Exp $
+ *	\version    $Id$
 */
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
@@ -238,5 +239,5 @@ if ($conf->fournisseur->enabled)
 print '</table>';
 $db->close();

-llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.24 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.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/admin/syslog.php
 *	\ingroup    syslog
 *	\brief      Setup page for syslog module
- *	\version    $Id: syslog.php,v 1.32 2011/07/31 22:23:26 eldy Exp $
+ *	\version    $Id$
 */

 require("../main.inc.php");
@@ -164,5 +165,5 @@ print '</td></tr>';
 print '</table>';
 print "</form>\n";

-llxFooter('$Date: 2011/07/31 22:23:26 $ - $Revision: 1.32 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -16,13 +16,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *       \file       htdocs/admin/system/about.php
 *       \brief      About Dolibarr File page
- *       \version    $Id: about.php,v 1.5 2011/07/31 22:23:14 eldy Exp $
+ *       \version    $Id$
 */

 require("../../main.inc.php");
@@ -122,7 +123,7 @@ print '</form>';
 print '</ul>';


-llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.5 $');
+llxFooter('$Date$ - $Revision$');
 ?>


--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -14,13 +14,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *		\file 		htdocs/admin/system/constall.php
 *		\brief      Page to show all Dolibarr setup (config file and database constants)
- *		\version    $Id: constall.php,v 1.24 2011/07/31 22:23:14 eldy Exp $
+ *		\version    $Id: constall.php,v 1.23 2011/07/30 10:23:26 eldy Exp $
 */

 require("../../main.inc.php");
--- a/htdocs/admin/system/database-tables-contraintes.php
+++ b/htdocs/admin/system/database-tables-contraintes.php
@@ -15,13 +15,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *       \file       htdocs/admin/system/database-tables-contraintes.php
 *       \brief      Page d'info des contraintes de la base
- *       \version    $Id: database-tables-contraintes.php,v 1.17 2011/07/31 22:23:14 eldy Exp $
+ *       \version    $Id$
 */

 require("../../main.inc.php");
@@ -116,5 +117,5 @@ else
 	print '</table>';
 }

-llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.17 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -15,13 +15,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *	\file       htdocs/admin/system/database-tables.php
 *	\brief      Page d'infos des tables de la base
- *	\version    $Id: database-tables.php,v 1.17 2011/07/31 22:23:14 eldy Exp $
+ *	\version    $Id$
 */

 require("../../main.inc.php");
@@ -169,5 +170,5 @@ else
 	}
 }

-llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.17 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -15,13 +15,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *   \file       htdocs/admin/system/database.php
 *   \brief      Page with system information of database
- *   \version    $Id: database.php,v 1.28 2011/07/31 22:23:14 eldy Exp $
+ *   \version    $Id$
 */

 require("../../main.inc.php");
@@ -136,5 +137,5 @@ else
 	}
 }

-llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.28 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -15,13 +15,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *  \file           htdocs/admin/system/dbtable.php
 *  \brief          Page d'info des contraintes d'une table
- *  \version        $Id: dbtable.php,v 1.12 2011/07/31 22:23:14 eldy Exp $
+ *  \version        $Id$
 */

 require("../../main.inc.php");
@@ -132,5 +133,5 @@ else
 	}
 }

-llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.12 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.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/system/dolibarr.php
 *  \brief      Page to show Dolibarr informations
- *  \version    $Id: dolibarr.php,v 1.59 2011/07/31 22:23:14 eldy Exp $
+ *  \version    $Id: dolibarr.php,v 1.58 2011/07/13 13:15:17 eldy Exp $
 */

 require("../../main.inc.php");
@@ -212,5 +213,5 @@ print '<tr '.$bc[$var].'><td width="300">=> '.$langs->trans("File encoding").'</
 print '</table>';
 print '<br>';

-llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.59 $');
+llxFooter('$Date: 2011/07/13 13:15:17 $ - $Revision: 1.58 $');
 ?>
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -14,13 +14,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *  \file       htdocs/admin/system/index.php
 *  \brief      Home page of system information
- *  \version    $Id: index.php,v 1.49 2011/07/31 22:23:14 eldy Exp $
+ *  \version    $Id: index.php,v 1.48 2011/07/27 23:50:52 eldy Exp $
 */

 require("../../main.inc.php");
@@ -126,5 +127,5 @@ print '<br>';
 print info_admin($langs->trans("SystemInfoDesc")).'<br>';


-llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $');
+llxFooter('$Date: 2011/07/27 23:50:52 $ - $Revision: 1.48 $');
 ?>
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -14,13 +14,14 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

 /**
 *  \file       htdocs/admin/system/modules.php
 *  \brief      File to list all Dolibarr modules
- *  \version    $Id: modules.php,v 1.15 2011/07/31 22:23:14 eldy Exp $
+ *  \version    $Id$
 */

 require("../../main.inc.php");
@@ -131,5 +132,5 @@ foreach($rights_ids as $right_id)
 	$old = $right_id;
 }

-llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.15 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/htdocs/admin/system/os.php
+++ b/htdocs/admin/system/os.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/system/os.php
 *		\brief      Page des infos systeme de l'OS
- *		\version    $Id: os.php,v 1.14 2011/07/31 22:23:14 eldy Exp $
+ *		\version    $Id$
 */

 require("../../main.inc.php");
@@ -51,5 +52,5 @@ print "<tr $bc[1]><td width=\"240\">".$langs->trans("Version")."</td><td>".$osve
 print '</table>';


-llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.14 $');
+llxFooter('$Date$ - $Revision$');
 ?>
--- a/Show More
+++ b/Show More